Reverted bigger parts of tuxdev patch:

[supertux.git] / src / player_status.cpp

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 24a1b99..95f994e 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -45,18 +45,8 @@ PlayerStatus::PlayerStatus()
     max_score_multiplier(1)
 {
   reset();
-  key_brass.reset(sprite_manager->create("images/objects/keys/key_brass.sprite"));
-  key_iron.reset(sprite_manager->create("images/objects/keys/key_iron.sprite"));
-  key_bronze.reset(sprite_manager->create("images/objects/keys/key_bronze.sprite"));
-  key_silver.reset(sprite_manager->create("images/objects/keys/key_silver.sprite"));
-  key_gold.reset(sprite_manager->create("images/objects/keys/key_gold.sprite"));
-  key_brass->set_action("outline");
-  key_iron->set_action("outline");
-  key_bronze->set_action("outline");
-  key_silver->set_action("outline");
-  key_gold->set_action("outline");
-  
-  tux_life.reset(sprite_manager->create("images/creatures/tux_small/tux-life.sprite"));
+
+  coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
 
   Console::instance->registerCommand("coins", this);
 }
@@ -68,31 +58,21 @@ PlayerStatus::~PlayerStatus()
 void PlayerStatus::reset()
 {
   coins = START_COINS;
-  keys = 0;
   bonus = NO_BONUS;
   score_multiplier = 1;
   max_score_multiplier = 1;
 }
 
 void
-PlayerStatus::add_coins(int count)
+PlayerStatus::add_coins(int count, bool play_sound)
 {
   coins = std::min(coins + count, MAX_COINS);
-  if(count >= 100)
-    sound_manager->play("sounds/lifeup.wav");
-  else
-    sound_manager->play("sounds/coin.wav");
-}
-
-void
-PlayerStatus::set_keys(int new_key)
-{
-  keys |= new_key;
-  key_brass->set_action(keys & KEY_BRASS ? "display" : "outline");
-  key_iron->set_action(keys & KEY_IRON ? "display" : "outline");
-  key_bronze->set_action(keys & KEY_BRONZE ? "display" : "outline");
-  key_silver->set_action(keys & KEY_SILVER ? "display" : "outline");
-  key_gold->set_action(keys & KEY_GOLD ? "display" : "outline");
+  if(play_sound) {
+    if(count >= 100)
+      sound_manager->play("sounds/lifeup.wav");
+    else
+      sound_manager->play("sounds/coin.wav");
+  }
 }
 
 void
@@ -117,12 +97,6 @@ PlayerStatus::write(lisp::Writer& writer)
   }
   writer.write_int("fireflowers", max_fire_bullets);
   writer.write_int("iceflowers", max_ice_bullets);
-  
-  writer.write_bool("key-brass", keys & KEY_BRASS);
-  writer.write_bool("key-iron", keys & KEY_IRON);
-  writer.write_bool("key-bronze", keys & KEY_BRONZE);
-  writer.write_bool("key-silver", keys & KEY_SILVER);
-  writer.write_bool("key-gold", keys & KEY_GOLD);
 
   writer.write_int("coins", coins);
   writer.write_int("max-score-multiplier", max_score_multiplier);
@@ -132,7 +106,7 @@ void
 PlayerStatus::read(const lisp::Lisp& lisp)
 {
   reset();
-  
+
   std::string bonusname;
   if(lisp.get("bonus", bonusname)) {
     if(bonusname == "none") {
@@ -151,55 +125,36 @@ PlayerStatus::read(const lisp::Lisp& lisp)
   lisp.get("fireflowers", max_fire_bullets);
   lisp.get("iceflowers", max_ice_bullets);
 
-  bool val = false;
-  if(lisp.get("key-brass", val) && val == true)
-    set_keys(KEY_BRASS);
-  if(lisp.get("key-iron", val) && val == true)
-    set_keys(KEY_IRON);
-  if(lisp.get("key-bronze", val) && val == true)
-    set_keys(KEY_BRONZE);
-  if(lisp.get("key-silver", val) && val == true)
-    set_keys(KEY_SILVER);
-  if(lisp.get("key-gold", val) && val == true)
-    set_keys(KEY_GOLD);
-
   lisp.get("coins", coins);
   lisp.get("max-score-multiplier", max_score_multiplier);
 }
 
 void
-PlayerStatus::draw_keys(DrawingContext& context)
-{
-  const float SPACING = 10;
-  float x,y; 
-  x = BORDER_X; y = BORDER_Y;
-  key_brass->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_brass->get_width() + SPACING;
-  key_iron->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_iron->get_width() + SPACING;
-  key_bronze->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_bronze->get_width() + SPACING;
-  key_silver->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_silver->get_width() + SPACING;
-  key_gold->draw(context, Vector(x, y), LAYER_FOREGROUND1);
-  x += key_gold->get_width() + SPACING;
-}
-
-void
 PlayerStatus::draw(DrawingContext& context)
 {
+  static int displayed_coins = -1;
+  static int next_count = 0;
+
+  if (displayed_coins == -1) displayed_coins = coins;
+  if (++next_count > 2) {
+    next_count = 0;
+    if (displayed_coins < coins) displayed_coins++;
+    if (displayed_coins > coins) displayed_coins--;
+  }
+  displayed_coins = std::min(std::max(displayed_coins, 0), 9999);
+
+  std::stringstream ss;
+  ss << displayed_coins;
+  std::string coins_text = ss.str();
+
   context.push_transform();
   context.set_translation(Vector(0, 0));
 
-  char str[60];
- 
-  int displayCoins = std::max(player_status->coins, 0);
-  sprintf(str, "%d", displayCoins);
-  const char* coinstext = _("COINS");
-  context.draw_text(white_text, coinstext, Vector(SCREEN_WIDTH - white_text->get_text_width(coinstext) - gold_text->get_text_width(" 99999") - BORDER_X, BORDER_Y), LEFT_ALLIGN, LAYER_FOREGROUND1);
-  context.draw_text(gold_text, str, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_FOREGROUND1);
-
-  //draw_keys(context);  
+  Surface* coin_surf = coin_surface.get();
+  if (coin_surf) {
+    context.draw_surface(coin_surf, Vector(SCREEN_WIDTH - BORDER_X - coin_surf->get_width() - gold_text->get_text_width(coins_text), BORDER_Y + 1), LAYER_FOREGROUND1);
+  }
+  context.draw_text(gold_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_FOREGROUND1);
 
   context.pop_transform();
 }
@@ -211,7 +166,6 @@ PlayerStatus::operator= (const PlayerStatus& other)
   bonus = other.bonus;
   score_multiplier = other.score_multiplier;
   max_score_multiplier = other.max_score_multiplier;
-  keys = other.keys;
 }
 
 bool
@@ -227,4 +181,3 @@ PlayerStatus::consoleCommand(std::string command, std::vector<std::string> argum
   }
   return false;
 }
-