X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.hpp;h=3df230be339378460761adb6a5f05c06e2e991ee;hb=f53572ad2b744ddddd7cc4b6479489543d44f98d;hp=0660d689749b65c317bf49f2194e06e46d89ea80;hpb=5d1290054358cb4560f54bcd6840121a69360bf9;p=supertux.git

diff --git a/src/player_status.hpp b/src/player_status.hpp
index 0660d6897..3df230be3 100644
--- a/src/player_status.hpp
+++ b/src/player_status.hpp
@@ -1,7 +1,8 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
+//  SuperTux
 //  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -46,43 +47,29 @@ public:
   ~PlayerStatus();
   void reset();     
   void add_coins(int count);
-  void set_keys(int new_key);
 
   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