fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / player_status.hpp

diff --git a/src/player_status.hpp b/src/player_status.hpp
index 5595d97..1559725 100644 (file)
--- a/src/player_status.hpp
+++ b/src/player_status.hpp
@@ -36,7 +36,7 @@ enum BonusType {
 };
 class DrawingContext;
 
-/** 
+/**
  * This class memorizes player status between different game sessions (for
  * example when switching maps in the worldmap)
  */
@@ -45,45 +45,31 @@ class PlayerStatus : public Serializable, public ConsoleCommandReceiver
 public:
   PlayerStatus();
   ~PlayerStatus();
-  void reset();     
-  void add_coins(int count);
-  void set_keys(int new_key);
+  void reset();
+  void add_coins(int count, bool play_sound = true);
 
   void write(lisp::Writer& writer);
   void read(const lisp::Lisp& lisp);
 
   void draw(DrawingContext& context);
-  void draw_keys(DrawingContext& context);
 
   bool consoleCommand(std::string command, std::vector<std::string> 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 */
+  int max_ice_bullets; /**< maximum number of ice bullets in play */
 
   int score_multiplier;
   int max_score_multiplier;
 
   void operator= (const PlayerStatus& other);
-  
-  enum {
-    KEY_BRASS  = 0x001,
-    KEY_IRON   = 0x002,
-    KEY_BRONZE = 0x004,
-    KEY_SILVER = 0x008,
-    KEY_GOLD   = 0x010,
-  };
 
 private:
   // don't use this
   PlayerStatus(const PlayerStatus& other);
-  
-  int  keys;
+
   std::auto_ptr<Sprite> tux_life;
-  std::auto_ptr<Sprite> key_iron;
-  std::auto_ptr<Sprite> key_brass;
-  std::auto_ptr<Sprite> key_bronze;
-  std::auto_ptr<Sprite> key_silver;
-  std::auto_ptr<Sprite> key_gold;
 };
 
 // global player state