* Don't kill Tux after winning a level. (Bug 675)

[supertux.git] / src / supertux / game_session.cpp

diff --git a/src/supertux/game_session.cpp b/src/supertux/game_session.cpp
index 7da344b..56c2a9b 100644 (file)
--- a/src/supertux/game_session.cpp
+++ b/src/supertux/game_session.cpp
@@ -22,6 +22,7 @@
 #include "audio/sound_manager.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "gui/menu.hpp"
+#include "gui/menu_manager.hpp"
 #include "math/random_generator.hpp"
 #include "object/camera.hpp"
 #include "object/endsequence_fireworks.hpp"
@@ -33,19 +34,16 @@
 #include "supertux/gameconfig.hpp"
 #include "supertux/levelintro.hpp"
 #include "supertux/globals.hpp"
-#include "supertux/mainloop.hpp"
-#include "supertux/options_menu.hpp"
+#include "supertux/screen_manager.hpp"
+#include "supertux/menu/menu_storage.hpp"
+#include "supertux/menu/game_menu.hpp"
+#include "supertux/menu/options_menu.hpp"
 #include "supertux/sector.hpp"
 #include "util/file_system.hpp"
 #include "util/gettext.hpp"
 #include "worldmap/worldmap.hpp"
 
-enum GameMenuIDs {
-  MNID_CONTINUE,
-  MNID_ABORTLEVEL
-};
-
-GameSession::GameSession(const std::string& levelfile_, Statistics* statistics) :
+GameSession::GameSession(const std::string& levelfile_, PlayerStatus* player_status, Statistics* statistics) :
   level(0), 
   statistics_backdrop(),
   scripts(),
@@ -61,6 +59,7 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
   newsector(),
   newspawnpoint(),
   best_level_statistics(statistics),
+  player_status(player_status),
   capture_demo_stream(0), 
   capture_file(),
   playback_demo_stream(0), 
@@ -73,34 +72,29 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
   currentsector = NULL;
 
   game_pause = false;
-  speed_before_pause = g_main_loop->get_speed();
+  speed_before_pause = g_screen_manager->get_speed();
 
-  statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
+  statistics_backdrop = Surface::create("images/engine/menu/score-backdrop.png");
 
-  restart_level();
+  if (restart_level() != 0)
+    throw std::runtime_error ("Initializing the level failed.");
 
-  game_menu.reset(new Menu());
-  game_menu->add_label(level->name);
-  game_menu->add_hl();
-  game_menu->add_entry(MNID_CONTINUE, _("Continue"));
-  game_menu->add_submenu(_("Options"), get_options_menu());
-  game_menu->add_hl();
-  game_menu->add_entry(MNID_ABORTLEVEL, _("Abort Level"));
+  game_menu.reset(new GameMenu(*level));
 }
 
-void
+int
 GameSession::restart_level()
 {
 
   if (edit_mode) {
     force_ghost_mode();
-    return;
+    return (-1);
   }
 
   game_pause   = false;
   end_sequence = 0;
 
-  g_main_controller->reset();
+  g_jk_controller->reset();
 
   currentsector = 0;
 
@@ -130,7 +124,8 @@ GameSession::restart_level()
     }
   } catch(std::exception& e) {
     log_fatal << "Couldn't start level: " << e.what() << std::endl;
-    g_main_loop->exit_screen();
+    g_screen_manager->exit_screen();
+    return (-1);
   }
 
   sound_manager->stop_music();
@@ -139,11 +134,13 @@ GameSession::restart_level()
   if(capture_file != "") {
     int newSeed=0;               // next run uses a new seed
     while (newSeed == 0)            // which is the next non-zero random num.
-      newSeed = systemRandom.rand();
-    g_config->random_seed = systemRandom.srand(newSeed);
+      newSeed = gameRandom.rand();
+    g_config->random_seed = gameRandom.srand(newSeed);
     log_info << "Next run uses random seed " << g_config->random_seed <<std::endl;
     record_demo(capture_file);
   }
+
+  return (0);
 }
 
 GameSession::~GameSession()
@@ -151,7 +148,6 @@ GameSession::~GameSession()
   delete capture_demo_stream;
   delete playback_demo_stream;
   delete demo_controller;
-  free_options_menu();
 }
 
 void
@@ -244,9 +240,9 @@ GameSession::toggle_pause()
 {
   // pause
   if(!game_pause) {
-    speed_before_pause = g_main_loop->get_speed();
-    g_main_loop->set_speed(0);
-    Menu::set_current(game_menu.get());
+    speed_before_pause = g_screen_manager->get_speed();
+    g_screen_manager->set_speed(0);
+    MenuManager::set_current(game_menu.get());
     game_menu->set_active_item(MNID_CONTINUE);
     game_pause = true;
   }
@@ -283,7 +279,7 @@ GameSession::force_ghost_mode()
 HSQUIRRELVM
 GameSession::run_script(std::istream& in, const std::string& sourcename)
 {
-  using namespace Scripting;
+  using namespace scripting;
 
   // garbage collect thread list
   for(ScriptList::iterator i = scripts.begin();
@@ -348,12 +344,13 @@ GameSession::process_events()
 
   // save input for demo?
   if(capture_demo_stream != 0) {
-    capture_demo_stream ->put(g_main_controller->hold(Controller::LEFT));
-    capture_demo_stream ->put(g_main_controller->hold(Controller::RIGHT));
-    capture_demo_stream ->put(g_main_controller->hold(Controller::UP));
-    capture_demo_stream ->put(g_main_controller->hold(Controller::DOWN));
-    capture_demo_stream ->put(g_main_controller->hold(Controller::JUMP));
-    capture_demo_stream ->put(g_main_controller->hold(Controller::ACTION));
+    Controller *controller = g_jk_controller->get_main_controller();
+    capture_demo_stream ->put(controller->hold(Controller::LEFT));
+    capture_demo_stream ->put(controller->hold(Controller::RIGHT));
+    capture_demo_stream ->put(controller->hold(Controller::UP));
+    capture_demo_stream ->put(controller->hold(Controller::DOWN));
+    capture_demo_stream ->put(controller->hold(Controller::JUMP));
+    capture_demo_stream ->put(controller->hold(Controller::ACTION));
   }
 }
 
@@ -391,17 +388,17 @@ GameSession::draw_pause(DrawingContext& context)
 void
 GameSession::process_menu()
 {
-  Menu* menu = Menu::current();
+  Menu* menu = MenuManager::current();
   if(menu) {
     if(menu == game_menu.get()) {
       switch (game_menu->check()) {
         case MNID_CONTINUE:
-          Menu::set_current(0);
+          MenuManager::set_current(0);
           toggle_pause();
           break;
         case MNID_ABORTLEVEL:
-          Menu::set_current(0);
-          g_main_loop->exit_screen();
+          MenuManager::set_current(0);
+          g_screen_manager->exit_screen();
           break;
       }
     }
@@ -411,6 +408,9 @@ GameSession::process_menu()
 void
 GameSession::setup()
 {
+  if (currentsector == NULL)
+    return;
+
   if(currentsector != Sector::current()) {
     currentsector->activate(currentsector->player->get_pos());
   }
@@ -423,7 +423,7 @@ GameSession::setup()
 
   if (!levelintro_shown) {
     levelintro_shown = true;
-    g_main_loop->push_screen(new LevelIntro(level.get(), best_level_statistics));
+    g_screen_manager->push_screen(new LevelIntro(level.get(), best_level_statistics));
   }
 }
 
@@ -431,15 +431,15 @@ void
 GameSession::update(float elapsed_time)
 {
   // handle controller
-  if(g_main_controller->pressed(Controller::PAUSE_MENU))
+  if(g_jk_controller->get_main_controller()->pressed(Controller::PAUSE_MENU))
     on_escape_press();
 
   process_events();
   process_menu();
 
   // Unpause the game if the menu has been closed
-  if (game_pause && !Menu::current()) {
-    g_main_loop->set_speed(speed_before_pause);
+  if (game_pause && !MenuManager::current()) {
+    g_screen_manager->set_speed(speed_before_pause);
     game_pause = false;
   }
 
@@ -500,7 +500,7 @@ GameSession::update(float elapsed_time)
 void
 GameSession::finish(bool win)
 {
-  using namespace WorldMapNS;
+  using namespace worldmap;
 
   if (edit_mode) {
     force_ghost_mode();
@@ -512,7 +512,7 @@ GameSession::finish(bool win)
       WorldMap::current()->finished_level(level.get());
   }
 
-  g_main_loop->exit_screen();
+  g_screen_manager->exit_screen();
 }
 
 void
@@ -572,13 +572,13 @@ GameSession::start_sequence(const std::string& sequencename)
   }
 
   /* slow down the game for end-sequence */
-  g_main_loop->set_speed(0.5f);
+  g_screen_manager->set_speed(0.5f);
 
   currentsector->add_object(end_sequence);
   end_sequence->start();
 
-  sound_manager->play_music("music/leveldone.music", false);
-  currentsector->player->invincible_timer.start(10000.0f);
+  sound_manager->play_music("music/leveldone.ogg", false);
+  currentsector->player->set_winning();
 
   // Stop all clocks.
   for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin();
@@ -600,7 +600,7 @@ GameSession::drawstatus(DrawingContext& context)
 
   // draw level stats while end_sequence is running
   if (end_sequence) {
-    level->stats.draw_endseq_panel(context, best_level_statistics, statistics_backdrop.get());
+    level->stats.draw_endseq_panel(context, best_level_statistics, statistics_backdrop);
   }
 }