* 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 88f7704..56c2a9b 100644 (file)
--- a/src/supertux/game_session.cpp
+++ b/src/supertux/game_session.cpp
@@ -76,24 +76,25 @@ GameSession::GameSession(const std::string& levelfile_, PlayerStatus* player_sta
 
   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 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;
 
@@ -124,6 +125,7 @@ GameSession::restart_level()
   } catch(std::exception& e) {
     log_fatal << "Couldn't start level: " << e.what() << std::endl;
     g_screen_manager->exit_screen();
+    return (-1);
   }
 
   sound_manager->stop_music();
@@ -137,6 +139,8 @@ GameSession::restart_level()
     log_info << "Next run uses random seed " << g_config->random_seed <<std::endl;
     record_demo(capture_file);
   }
+
+  return (0);
 }
 
 GameSession::~GameSession()
@@ -340,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));
   }
 }
 
@@ -403,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 +431,7 @@ 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();
@@ -570,7 +578,7 @@ GameSession::start_sequence(const std::string& sequencename)
   end_sequence->start();
 
   sound_manager->play_music("music/leveldone.ogg", false);
-  currentsector->player->invincible_timer.start(10000.0f);
+  currentsector->player->set_winning();
 
   // Stop all clocks.
   for(std::vector<GameObject*>::iterator i = currentsector->gameobjects.begin();