X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fscene.h;h=b8d55963cbad2fdc1d42f57f9b1250c680f6fade;hb=e4d4375bf4b6802321d956f5f3886320b7275cf0;hp=57745d2d5902e841a14ad01737e3203745444c23;hpb=c79b901309bf5e0544fef1e92d264f51402f4370;p=supertux.git diff --git a/src/scene.h b/src/scene.h index 57745d2d5..b8d55963c 100644 --- a/src/scene.h +++ b/src/scene.h @@ -20,7 +20,7 @@ #ifndef SUPERTUX_SCENE_H #define SUPERTUX_SCENE_H -#include "screen/surface.h" +#include "video/surface.h" #include "timer.h" #define FRAME_RATE 10 // 100 Frames per second (10ms) @@ -28,17 +28,18 @@ // 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(); + void incLives(); + void incCoins(); }; std::string bonus_to_string(PlayerStatus::BonusType b); @@ -46,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*/