X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscene.h;h=23bbb28d889c05cb106f137eef696ced279bf20b;hb=b524515944583916655a9f2cf1a667e55e7ed4ce;hp=d2fa82f8589176b66edf8bfe64539490c1d12ff8;hpb=8d72041c32613175e6b7eecd34007dbb402f0b91;p=supertux.git diff --git a/src/scene.h b/src/scene.h index d2fa82f85..23bbb28d8 100644 --- a/src/scene.h +++ b/src/scene.h @@ -20,21 +20,21 @@ #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(); @@ -46,7 +46,6 @@ PlayerStatus::BonusType string_to_bonus(const std::string& str); extern PlayerStatus player_status; -extern float scroll_x, scroll_y; extern unsigned int global_frame_counter; #endif /*SUPERTUX_SCENE_H*/