In-game HUD now uses icons instead of text /

[supertux.git] / src / player_status.cpp

diff --git a/src/player_status.cpp b/src/player_status.cpp
index c39c6fa..f638bca 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -45,8 +45,8 @@ PlayerStatus::PlayerStatus()
     max_score_multiplier(1)
 {
   reset();
-  
-  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);
 }
@@ -64,13 +64,15 @@ void PlayerStatus::reset()
 }
 
 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");
+  if(play_sound) {
+    if(count >= 100)
+      sound_manager->play("sounds/lifeup.wav");
+    else
+      sound_manager->play("sounds/coin.wav");
+  }
 }
 
 void
@@ -95,7 +97,7 @@ PlayerStatus::write(lisp::Writer& writer)
   }
   writer.write_int("fireflowers", max_fire_bullets);
   writer.write_int("iceflowers", max_ice_bullets);
-  
+
   writer.write_int("coins", coins);
   writer.write_int("max-score-multiplier", max_score_multiplier);
 }
@@ -104,7 +106,7 @@ void
 PlayerStatus::read(const lisp::Lisp& lisp)
 {
   reset();
-  
+
   std::string bonusname;
   if(lisp.get("bonus", bonusname)) {
     if(bonusname == "none") {
@@ -130,16 +132,29 @@ PlayerStatus::read(const lisp::Lisp& lisp)
 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);
+  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();
 }
@@ -166,4 +181,3 @@ PlayerStatus::consoleCommand(std::string command, std::vector<std::string> argum
   }
   return false;
 }
-