X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fscene.h;h=b8d55963cbad2fdc1d42f57f9b1250c680f6fade;hb=763454f90866bd4e7db95e5884c48a25d6b9bda1;hp=bb7e1d376dae2fa29a241c8996ca0d0cef116499;hpb=a2857397f9afd626046a2005d2614a14d9e11804;p=supertux.git diff --git a/src/scene.h b/src/scene.h index bb7e1d376..b8d55963c 100644 --- a/src/scene.h +++ b/src/scene.h @@ -21,7 +21,7 @@ #define SUPERTUX_SCENE_H #include "video/surface.h" -#include "special/timer.h" +#include "timer.h" #define FRAME_RATE 10 // 100 Frames per second (10ms) @@ -34,10 +34,12 @@ struct PlayerStatus BonusType bonus; int score_multiplier; + int max_score_multiplier; PlayerStatus(); - void reset(); + void incLives(); + void incCoins(); }; std::string bonus_to_string(PlayerStatus::BonusType b); @@ -45,6 +47,4 @@ PlayerStatus::BonusType string_to_bonus(const std::string& str); extern PlayerStatus player_status; -extern unsigned int global_frame_counter; - #endif /*SUPERTUX_SCENE_H*/