X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplayer_status.hpp;h=520bd7423296bf52d0ed1e823c13269df6505920;hb=8359a7408f6528b3d3e05d669fe081ccd6d2a19b;hp=155972524a4fbdcffde019a54f73a29e1478a5e9;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git diff --git a/src/player_status.hpp b/src/player_status.hpp index 155972524..520bd7423 100644 --- a/src/player_status.hpp +++ b/src/player_status.hpp @@ -20,13 +20,13 @@ #ifndef SUPERTUX_PLAYERSTATUS_H #define SUPERTUX_PLAYERSTATUS_H -#include #include -#include "lisp/lisp.hpp" -#include "timer.hpp" #include "serializable.hpp" -#include "sprite/sprite.hpp" -#include "console.hpp" +#include "video/color.hpp" + +namespace lisp{ class Writer; } +namespace lisp{ class Lisp; } +class Surface; static const float BORDER_X = 10; static const float BORDER_Y = 10; @@ -40,8 +40,9 @@ class DrawingContext; * This class memorizes player status between different game sessions (for * example when switching maps in the worldmap) */ -class PlayerStatus : public Serializable, public ConsoleCommandReceiver +class PlayerStatus : public Serializable { + static Color text_color; public: PlayerStatus(); ~PlayerStatus(); @@ -53,8 +54,6 @@ public: void draw(DrawingContext& context); - bool consoleCommand(std::string command, std::vector arguments); /**< callback from Console; return false if command was unknown, true otherwise */ - int coins; BonusType bonus; int max_fire_bullets; /**< maximum number of fire bullets in play */ @@ -69,7 +68,7 @@ private: // don't use this PlayerStatus(const PlayerStatus& other); - std::auto_ptr tux_life; + std::auto_ptr coin_surface; }; // global player state