X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=44512a1da63e3ee05911a264feb83ebb3264db69;hb=8372bc7834408184195e060a3f9bfef90b2365b6;hp=ee8647701963a397a7af0149f5df43bb6742bb2a;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index ee8647701..44512a1da 100644
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -19,6 +19,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
+#include <math.h>
 #include "lisp/writer.hpp"
 #include "lisp/lisp.hpp"
 #include "player_status.hpp"
@@ -46,7 +47,7 @@ PlayerStatus::PlayerStatus()
 {
   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);
 }
@@ -132,16 +133,31 @@ 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) || (fabsf(displayed_coins - coins) > 100)) {
+    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);
-  snprintf(str, sizeof(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_HUD);
+  }
+  context.draw_text(gold_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_HUD);
 
   context.pop_transform();
 }