When swap keep statistics so far. (not tested - I'd appreaciate if someone would...

Also, when you go to some swap, you'll always stay there, even if you die before it - requested by various players.

SVN-Revision: 1950

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index a6c3a5f..63f7791 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -99,6 +99,9 @@ GameSession::GameSession(const std::string& levelname_, int mode, bool flip_leve
   if(flip_levels_mode)
     flip_level = true;
 
+  last_swap_point = Vector(-1, -1);
+  last_swap_stats.reset();
+
   restart_level();
 }
 
@@ -143,9 +146,19 @@ GameSession::restart_level()
   if(tux_pos.x != -1)
     {
     tux_pos = currentsector->get_best_spawn_point(tux_pos);
+
+    if(last_swap_point.x > tux_pos.x)
+      tux_pos = last_swap_point;
+    else  // new swap point
+      {
+      last_swap_point = tux_pos;
+
+      last_swap_stats += global_stats;
+      }
+
     currentsector->player->base.x = tux_pos.x;
     currentsector->player->base.y = tux_pos.y;
-    
+
     // has to reset camera on swapping
     currentsector->camera->reset(Vector(currentsector->player->base.x,
                                         currentsector->player->base.y));
@@ -543,6 +556,7 @@ GameSession::check_end_conditions()
   if(end_sequence && !endsequence_timer.check())
     {
       exit_status = ES_LEVEL_FINISHED;
+      global_stats += last_swap_stats;  // add swap points stats
       return;
     }
   else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)

diff --git a/src/gameloop.h b/src/gameloop.h
index 1bc6b10..d98ff54 100644 (file)
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -25,6 +25,7 @@
 #include "special/timer.h"
 #include "special/base.h"
 #include "special/frame_rate.h"
+#include "statistics.h"
 
 using namespace SuperTux;
 
@@ -122,6 +123,12 @@ private:
   // for fire works
   Timer random_timer;
 
+  // swap points
+  Vector last_swap_point;
+  Statistics last_swap_stats;
+
+  Statistics* best_level_statistics;
+
   void restart_level();
 
   void check_end_conditions();
@@ -135,8 +142,6 @@ private:
 
   void on_escape_press();
   void process_menu();
-
-  Statistics* best_level_statistics;
 };
 
 std::string slotinfo(int slot);