X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplayer_status.hpp;h=85ac0590ba2beb96086e23345fbc87b918af736d;hb=8f3c5b1261e44fdb9a8d9e37879170ae2caf5937;hp=ce3dee09297c9d40721f42af3e229c299d32afee;hpb=efc61e9d05b077f13a76982590fb0bd6a9d8dc61;p=supertux.git

diff --git a/src/player_status.hpp b/src/player_status.hpp
index ce3dee092..85ac0590b 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
@@ -19,11 +20,12 @@
 #ifndef SUPERTUX_PLAYERSTATUS_H
 #define SUPERTUX_PLAYERSTATUS_H
 
-#include <assert.h>
-#include "lisp/lisp.hpp"
-#include "timer.hpp"
+#include <memory>
 #include "serializable.hpp"
-#include "sprite/sprite.hpp"
+
+namespace lisp{ class Writer; }
+namespace lisp{ class Lisp; }
+class Surface;
 
 static const float BORDER_X = 10;
 static const float BORDER_Y = 10;
@@ -33,7 +35,7 @@ enum BonusType {
 };
 class DrawingContext;
 
-/** 
+/**
  * This class memorizes player status between different game sessions (for
  * example when switching maps in the worldmap)
  */
@@ -42,44 +44,29 @@ class PlayerStatus : public Serializable
 public:
   PlayerStatus();
   ~PlayerStatus();
-  void reset();     
-  void incLives();
-  void incCoins();
-  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);
 
   int  coins;
-  int  lives;
   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;
-  Sprite* key_iron;
-  Sprite* key_brass;
-  Sprite* key_bronze;
-  Sprite* key_silver;
-  Sprite* key_gold;
+
+  std::auto_ptr<Surface> coin_surface;
 };
 
 // global player state