X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgame_session.cpp;h=5caed2e23e78fb5ec94b545ba605c21b0fffd6af;hb=339968d0eb222f5cad1397580631ab44acf40b10;hp=1159d2ce4bfd1390059b1fb74e555c2ffd0b1e20;hpb=d41074beb3da03264ec115c29ff502729477bf87;p=supertux.git

diff --git a/src/game_session.cpp b/src/game_session.cpp
index 1159d2ce4..5caed2e23 100644
--- a/src/game_session.cpp
+++ b/src/game_session.cpp
@@ -90,7 +90,7 @@ GameSession::GameSession(const std::string& levelfile_, Statistics* statistics)
 {
   current_ = this;
   currentsector = NULL;
-  
+
   game_pause = false;
 
   statistics_backdrop.reset(new Surface("images/engine/menu/score-backdrop.png"));
@@ -122,7 +122,7 @@ GameSession::restart_level(bool fromBeginning)
   level->stats.total_badguys = level->get_total_badguys();
   level->stats.total_secrets = level->get_total_count<SecretAreaTrigger>();
   level->stats.reset();
-  if (!fromBeginning) level->stats.declare_invalid();
+  if (!fromBeginning && (reset_sector != "")) level->stats.declare_invalid();
 
   if (fromBeginning) reset_sector="";
   if(reset_sector != "") {
@@ -139,7 +139,7 @@ GameSession::restart_level(bool fromBeginning)
       throw std::runtime_error("Couldn't find main sector");
     currentsector->activate("main");
   }
-  
+
   //levelintro();
 
   currentsector->play_music(LEVEL_MUSIC);
@@ -169,8 +169,8 @@ void
 GameSession::record_demo(const std::string& filename)
 {
   delete capture_demo_stream;
-  
-  capture_demo_stream = new std::ofstream(filename.c_str()); 
+
+  capture_demo_stream = new std::ofstream(filename.c_str());
   if(!capture_demo_stream->good()) {
     std::stringstream msg;
     msg << "Couldn't open demo file '" << filename << "' for writing.";
@@ -208,7 +208,7 @@ GameSession::play_demo(const std::string& filename)
 {
   delete playback_demo_stream;
   delete demo_controller;
-  
+
   playback_demo_stream = new std::ifstream(filename.c_str());
   if(!playback_demo_stream->good()) {
     std::stringstream msg;
@@ -229,20 +229,9 @@ GameSession::play_demo(const std::string& filename)
     playback_demo_stream->seekg(0);     // old style w/o seed, restart at beg
 }
 
-namespace {
-  inline const char* chain(const char* c1, const char* c2) {
-    return (std::string(c1) + std::string(c2)).c_str();
-  }
-  inline const char* chain(const char* c1, const char* c2, const char* c3) {
-    return (std::string(c1) + std::string(c2) + std::string(c3)).c_str();
-  }
-}
-
 void
 GameSession::levelintro()
 {
-  char str[60];
-
   sound_manager->stop_music();
 
   DrawingContext context;
@@ -263,13 +252,14 @@ GameSession::levelintro()
   context.draw_center_text(gold_text, level->get_name(), Vector(0, 160),
       LAYER_FOREGROUND1);
 
-  snprintf(str, sizeof(str), chain(_("Coins"), ": %d"), player_status->coins);
-  context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 210),
+  std::stringstream ss_coins;
+  ss_coins << _("Coins") << ": " << player_status->coins;
+  context.draw_text(white_text, ss_coins.str(), Vector(SCREEN_WIDTH/2, 210),
       CENTER_ALLIGN, LAYER_FOREGROUND1);
 
   if((level->get_author().size()) && (level->get_author() != "SuperTux Team"))
     context.draw_text(white_small_text,
-      std::string(_("contributed by ")) + level->get_author(), 
+      std::string(_("contributed by ")) + level->get_author(),
       Vector(SCREEN_WIDTH/2, 350), CENTER_ALLIGN, LAYER_FOREGROUND1);
 
   if(best_level_statistics != NULL)
@@ -282,7 +272,12 @@ void
 GameSession::on_escape_press()
 {
   if(currentsector->player->is_dying() || end_sequence != NO_ENDSEQUENCE)
+  {
+    // Let the timers run out, we fast-forward them to force past a sequence
+    endsequence_timer.start(FLT_EPSILON); 
+    currentsector->player->dying_timer.start(FLT_EPSILON);
     return;   // don't let the player open the menu, when he is dying
+  }
 
   if(level->on_menukey_script != "") {
     std::istringstream in(level->on_menukey_script);
@@ -291,7 +286,7 @@ GameSession::on_escape_press()
     toggle_pause();
   }
 }
-  
+
 void
 GameSession::toggle_pause()
 {
@@ -352,9 +347,9 @@ GameSession::process_events()
     }
 
     end_sequence_controller->press(Controller::RIGHT);
-    
+
     if (int(last_x_pos) == int(tux.get_pos().x))
-      end_sequence_controller->press(Controller::JUMP);    
+      end_sequence_controller->press(Controller::JUMP);
     last_x_pos = tux.get_pos().x;
   }
 
@@ -387,7 +382,7 @@ GameSession::process_events()
     capture_demo_stream ->put(main_controller->hold(Controller::RIGHT));
     capture_demo_stream ->put(main_controller->hold(Controller::UP));
     capture_demo_stream ->put(main_controller->hold(Controller::DOWN));
-    capture_demo_stream ->put(main_controller->hold(Controller::JUMP));   
+    capture_demo_stream ->put(main_controller->hold(Controller::JUMP));
     capture_demo_stream ->put(main_controller->hold(Controller::ACTION));
   }
 }
@@ -402,20 +397,20 @@ GameSession::check_end_conditions()
     finish(true);
     return;
   } else if (!end_sequence && tux->is_dead()) {
-    if (player_status->coins < 0) { 
+    if (player_status->coins < 0) {
       // No more coins: restart level from beginning
       player_status->coins = 0;
       restart_level(true);
-    } else { 
+    } else {
       // Still has coins: restart level from last reset point
       restart_level(false);
     }
-    
+
     return;
   }
 }
 
-void 
+void
 GameSession::draw(DrawingContext& context)
 {
   currentsector->draw(context);
@@ -432,7 +427,7 @@ GameSession::draw_pause(DrawingContext& context)
       Vector(0,0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT),
       Color(.2, .2, .2, .5), LAYER_FOREGROUND1);
 }
-  
+
 void
 GameSession::process_menu()
 {
@@ -472,7 +467,7 @@ GameSession::update(float elapsed_time)
   // handle controller
   if(main_controller->pressed(Controller::PAUSE_MENU))
     on_escape_press();
-  
+
   process_events();
   process_menu();
 
@@ -500,7 +495,7 @@ GameSession::update(float elapsed_time)
       play_time += elapsed_time; //TODO: make sure we don't count cutscene time
       level->stats.time = play_time;
       currentsector->update(elapsed_time);
-    } 
+    }
   }
 
   // update sounds
@@ -509,7 +504,7 @@ GameSession::update(float elapsed_time)
   /* Handle music: */
   if (end_sequence)
     return;
-  
+
   if(currentsector->player->invincible_timer.started()) {
     if(currentsector->player->invincible_timer.get_timeleft() <=
        TUX_INVINCIBLE_TIME_WARNING) {
@@ -531,7 +526,7 @@ GameSession::finish(bool win)
     if(WorldMap::current())
       WorldMap::current()->finished_level(level.get());
   }
-  
+
   main_loop->exit_screen();
 }
 
@@ -562,7 +557,7 @@ GameSession::display_info_box(const std::string& text)
 
   bool running = true;
   DrawingContext context;
-  
+
   while(running)  {
 
     // TODO make a screen out of this, another mainloop is ugly
@@ -641,4 +636,3 @@ GameSession::drawstatus(DrawingContext& context)
     level->stats.draw_endseq_panel(context, best_level_statistics, statistics_backdrop.get());
   }
 }
-