eliminated global scroll_x and scroll_y variables

[supertux.git] / src / scene.cpp

diff --git a/src/scene.cpp b/src/scene.cpp
index d78df47..0ee4d1c 100644 (file)
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -19,18 +19,54 @@
 
 #include <stdlib.h>
 #include "scene.h"
+#include "defines.h"
 
 PlayerStatus player_status;
 
 PlayerStatus::PlayerStatus()
   : score(0),
     distros(0),
-    lives(3)
+    lives(START_LIVES),
+    bonus(NO_BONUS),
+    score_multiplier(1)
 {
 }
 
-// FIXME: Move this into a view class
-float scroll_x;
+void PlayerStatus::reset()
+{
+  score = 0;
+  distros = 0;
+  lives = START_LIVES;
+  bonus = NO_BONUS;
+  score_multiplier = 1;
+}
+
+std::string bonus_to_string(PlayerStatus::BonusType b)
+{
+  switch (b)
+    {
+    case PlayerStatus::NO_BONUS:
+      return "none";
+    case PlayerStatus::GROWUP_BONUS:
+      return "growup";
+    case PlayerStatus::FLOWER_BONUS:
+      return "icflower";
+    default:
+      return "none";
+    }
+}
+
+PlayerStatus::BonusType string_to_bonus(const std::string& str)
+{
+  if (str == "none")
+    return PlayerStatus::NO_BONUS;
+  else if (str == "growup")
+    return PlayerStatus::GROWUP_BONUS;
+  else if (str == "iceflower")
+    return PlayerStatus::FLOWER_BONUS;
+  else
+    return PlayerStatus::NO_BONUS;
+}
 
 unsigned int global_frame_counter;