X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscene.cpp;h=a2350355f22889b9aa77a204826ea015c3c58e9a;hb=546364c9567ef212ea9276201facf73f5ada696a;hp=d7034a9a076530027b5b47567ee60f9fbe322d40;hpb=2388a02493831f3ec11f1df66a0cf7b09995279b;p=supertux.git

diff --git a/src/scene.cpp b/src/scene.cpp
index d7034a9a0..a2350355f 100644
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -17,28 +17,29 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include <stdlib.h>
+#include <cstdlib>
+
 #include "scene.h"
 #include "defines.h"
 
 PlayerStatus player_status;
 
 PlayerStatus::PlayerStatus()
-  : score(0),
-    distros(0),
+  : distros(0),
     lives(START_LIVES),
     bonus(NO_BONUS),
-    score_multiplier(1)
+    score_multiplier(1),
+    max_score_multiplier(1)
 {
 }
 
 void PlayerStatus::reset()
 {
-  score = 0;
   distros = 0;
   lives = START_LIVES;
   bonus = NO_BONUS;
   score_multiplier = 1;
+  max_score_multiplier = 1;
 }
 
 std::string bonus_to_string(PlayerStatus::BonusType b)
@@ -50,7 +51,7 @@ std::string bonus_to_string(PlayerStatus::BonusType b)
     case PlayerStatus::GROWUP_BONUS:
       return "growup";
     case PlayerStatus::FLOWER_BONUS:
-      return "icflower";
+      return "iceflower";
     default:
       return "none";
     }
@@ -68,9 +69,6 @@ PlayerStatus::BonusType string_to_bonus(const std::string& str)
     return PlayerStatus::NO_BONUS;
 }
 
-// FIXME: Move this into a view class
-float scroll_x;
-
 unsigned int global_frame_counter;
 
 // EOF //