X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=08259e870fd0e4d460f7fb07c1dbb23fddddd2aa;hb=8372bc7834408184195e060a3f9bfef90b2365b6;hp=b647423d9ead0574ab5ea92b21706850d83b5f83;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index b647423d9..08259e870 100644 --- a/src/title.cpp +++ b/src/title.cpp @@ -1,8 +1,8 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2000 Bill Kendrick // Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA @@ -35,7 +35,6 @@ #include "title.hpp" #include "mainloop.hpp" -#include "video/screen.hpp" #include "video/drawing_context.hpp" #include "video/surface.hpp" #include "audio/sound_manager.hpp" @@ -46,7 +45,7 @@ #include "level.hpp" #include "world.hpp" #include "game_session.hpp" -#include "worldmap.hpp" +#include "worldmap/worldmap.hpp" #include "player_status.hpp" #include "tile.hpp" #include "sector.hpp" @@ -55,14 +54,25 @@ #include "object/player.hpp" #include "resources.hpp" #include "gettext.hpp" -#include "misc.hpp" #include "textscroller.hpp" +#include "fadeout.hpp" #include "file_system.hpp" #include "control/joystickkeyboardcontroller.hpp" #include "control/codecontroller.hpp" #include "main.hpp" #include "log.hpp" +#include "options_menu.hpp" #include "console.hpp" +#include "random_generator.hpp" + +enum MainMenuIDs { + MNID_STARTGAME, + MNID_LEVELS_CONTRIB, + MNID_OPTIONMENU, + MNID_LEVELEDITOR, + MNID_CREDITS, + MNID_QUITMAINMENU +}; void TitleScreen::update_load_game_menu() @@ -92,7 +102,7 @@ void TitleScreen::generate_contrib_menu() { /** Generating contrib levels list by making use of Level Subset */ - std::vector level_worlds; + std::vector level_worlds; char** files = PHYSFS_enumerateFiles("levels/"); for(const char* const* filename = files; *filename != 0; ++filename) { std::string filepath = std::string("levels/") + *filename; @@ -106,7 +116,7 @@ TitleScreen::generate_contrib_menu() contrib_menu->add_label(_("Contrib Levels")); contrib_menu->add_hl(); - + int i = 0; for (std::vector::iterator it = level_worlds.begin(); it != level_worlds.end(); ++it) { @@ -190,11 +200,10 @@ TitleScreen::check_contrib_world_menu() if (contrib_world_menu->get_item_by_id(index).kind == MN_ACTION) { sound_manager->stop_music(); GameSession* session = - new GameSession( - current_world->get_level_filename(index), ST_GL_PLAY); + new GameSession(current_world->get_level_filename(index)); main_loop->push_screen(session); } - } + } } void @@ -214,26 +223,26 @@ TitleScreen::make_tux_jump() controller->press(Controller::RIGHT); // Determine how far we moved since last frame - float dx = fabsf(last_tux_x_pos - tux->get_pos().x); - float dy = fabsf(last_tux_y_pos - tux->get_pos().y); - - // Calculate space to check for obstacles + float dx = fabsf(last_tux_x_pos - tux->get_pos().x); + float dy = fabsf(last_tux_y_pos - tux->get_pos().y); + + // Calculate space to check for obstacles Rect lookahead = tux->get_bbox(); lookahead.move(Vector(96, 0)); - + // Check if we should press the jump button bool randomJump = !randomWaitTimer.started(); bool notMoving = (fabsf(dx) + fabsf(dy)) < 0.1; - bool pathBlocked = !sector->is_free_space(lookahead); + bool pathBlocked = !sector->is_free_of_statics(lookahead); if (!controller->released(Controller::JUMP) && (notMoving || pathBlocked || randomJump)) { float jumpDuration; if(pathBlocked) jumpDuration = 0.5; else - jumpDuration = float(rand() % 500 + 300) / 1000.0; + jumpDuration = systemRandom.randf(0.3, 0.8); jumpPushTimer.start(jumpDuration); - randomWaitTimer.start(float(rand() % 3000 + 3000) / 1000.0); + randomWaitTimer.start(systemRandom.randf(3.0, 6.0)); } // Keep jump button pressed @@ -245,7 +254,7 @@ TitleScreen::make_tux_jump() last_tux_y_pos = tux->get_pos().y; // Wrap around at the end of the level back to the beginnig - if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) { + if(sector->get_width() - 320 < tux->get_pos().x) { sector->activate("main"); sector->camera->reset(tux->get_pos()); } @@ -254,10 +263,18 @@ TitleScreen::make_tux_jump() TitleScreen::TitleScreen() { controller.reset(new CodeController()); - titlesession.reset(new GameSession("levels/misc/menu.stl", ST_GL_DEMO_GAME)); + titlesession.reset(new GameSession("levels/misc/menu.stl")); Player* player = titlesession->get_current_sector()->player; player->set_controller(controller.get()); + + main_menu.reset(new Menu()); + main_menu->set_pos(SCREEN_WIDTH/2, 335); + main_menu->add_entry(MNID_STARTGAME, _("Start Game")); + main_menu->add_entry(MNID_LEVELS_CONTRIB, _("Contrib Levels")); + main_menu->add_submenu(_("Options"), get_options_menu()); + main_menu->add_entry(MNID_CREDITS, _("Credits")); + main_menu->add_entry(MNID_QUITMAINMENU, _("Quit")); } TitleScreen::~TitleScreen() @@ -275,7 +292,7 @@ TitleScreen::setup() sector->activate(sector->player->get_pos()); } - Menu::set_current(main_menu); + Menu::set_current(main_menu.get()); } void @@ -283,6 +300,7 @@ TitleScreen::leave() { Sector* sector = titlesession->get_current_sector(); sector->deactivate(); + Menu::set_current(NULL); } void @@ -290,12 +308,6 @@ TitleScreen::draw(DrawingContext& context) { Sector* sector = titlesession->get_current_sector(); sector->draw(context); - - /* - if (Menu::current() == main_menu) - context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->get_width()/2, 30), - LAYER_FOREGROUND1+1); - */ context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n", Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1); @@ -317,12 +329,12 @@ TitleScreen::update(float elapsed_time) sector->update(elapsed_time); make_tux_jump(); - + Menu* menu = Menu::current(); if(menu) { menu->update(); - - if(menu == main_menu) { + + if(menu == main_menu.get()) { switch (main_menu->check()) { case MNID_STARTGAME: // Start Game, ie. goto the slots menu @@ -340,11 +352,11 @@ TitleScreen::update(float elapsed_time) Menu::push_current(contrib_menu.get()); break; case MNID_CREDITS: - fadeout(500); - main_loop->push_screen(new TextScroller("credits.txt")); + main_loop->push_screen(new TextScroller("credits.txt"), + new FadeOut(0.5)); break; case MNID_QUITMAINMENU: - main_loop->quit(); + main_loop->quit(new FadeOut(0.25)); break; } } else if(menu == load_game_menu.get()) { @@ -354,7 +366,7 @@ TitleScreen::update(float elapsed_time) std::stringstream stream; stream << slot; std::string str = _("Are you sure you want to delete slot") + stream.str() + "?"; - + if(confirm_dialog(bkg_title, str.c_str())) { str = "save/slot" + stream.str() + ".stsg"; log_debug << "Removing: " << str << std::endl; @@ -362,7 +374,7 @@ TitleScreen::update(float elapsed_time) } update_load_save_game_menu(load_game_menu); - Menu::set_current(main_menu); + Menu::set_current(main_menu.get()); }*/ process_load_game_menu(); } else if(menu == contrib_menu.get()) { @@ -375,7 +387,7 @@ TitleScreen::update(float elapsed_time) // reopen menu of user closed it (so that the app doesn't close when user // accidently hit ESC) if(Menu::current() == 0) { - Menu::set_current(main_menu); + Menu::set_current(main_menu.get()); } } @@ -430,8 +442,6 @@ TitleScreen::process_load_game_menu() stream << "save/" << worlddirname << "_" << slot << ".stsg"; std::string slotfile = stream.str(); - fadeout(256); - try { current_world->set_savegame_filename(slotfile); current_world->run(); @@ -441,4 +451,3 @@ TitleScreen::process_load_game_menu() return true; } -