moved my personal scons todo to the global one, so that someone else can work on...

[supertux.git] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index 4038bd0..23bbb28 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -20,26 +20,32 @@
 #ifndef SUPERTUX_SCENE_H
 #define SUPERTUX_SCENE_H
 
-#include "texture.h"
-#include "timer.h"
+#include "video/surface.h"
+#include "special/timer.h"
 
 #define FRAME_RATE 10 // 100 Frames per second (10ms)
 
 // Player stats
 struct PlayerStatus
 {
-  int  score;
   int  distros;
   int  lives;
+  enum BonusType { NO_BONUS, GROWUP_BONUS, FLOWER_BONUS };
+  BonusType bonus;
 
   int  score_multiplier;
+  int max_score_multiplier;
 
   PlayerStatus();
+
+  void reset();
 };
 
+std::string bonus_to_string(PlayerStatus::BonusType b);
+PlayerStatus::BonusType string_to_bonus(const std::string& str);
+
 extern PlayerStatus player_status;
 
-extern float scroll_x;
 extern unsigned int global_frame_counter;
 
 #endif /*SUPERTUX_SCENE_H*/