X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=bb00f83edf63be8f3e3bdb6470968e859be1b6ad;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=c39c6faf47d6c7d709a85862c237bc7f1938cdd1;hpb=13c6f377301f91c8d79ab768ba97b5eb771ed624;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index c39c6faf4..bb00f83ed 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"
@@ -30,9 +31,10 @@
 #include "math/vector.hpp"
 #include "main.hpp"
 #include "log.hpp"
+#include "timer.hpp"
 
 static const int START_COINS = 100;
-static const int MAX_COINS = 99999;
+static const int MAX_COINS = 9999;
 
 PlayerStatus* player_status = 0;
 
@@ -40,15 +42,13 @@ PlayerStatus::PlayerStatus()
   : coins(START_COINS),
     bonus(NO_BONUS),
     max_fire_bullets(0),
-    max_ice_bullets(0),
-    score_multiplier(1),
-    max_score_multiplier(1)
+    max_ice_bullets(0)
 {
   reset();
-  
-  tux_life.reset(sprite_manager->create("images/creatures/tux_small/tux-life.sprite"));
 
-  Console::instance->registerCommand("coins", this);
+  coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
+  sound_manager->preload("sounds/coin.wav");
+  sound_manager->preload("sounds/lifeup.wav");
 }
 
 PlayerStatus::~PlayerStatus()
@@ -59,18 +59,21 @@ void PlayerStatus::reset()
 {
   coins = START_COINS;
   bonus = NO_BONUS;
-  score_multiplier = 1;
-  max_score_multiplier = 1;
 }
 
 void
-PlayerStatus::add_coins(int count)
+PlayerStatus::add_coins(int count, bool play_sound)
 {
+  static float sound_played_time = 0;
   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 if (real_time > sound_played_time + 0.010) {
+      sound_manager->play("sounds/coin.wav");
+      sound_played_time = real_time;
+    }
+  }
 }
 
 void
@@ -78,33 +81,32 @@ PlayerStatus::write(lisp::Writer& writer)
 {
   switch(bonus) {
     case NO_BONUS:
-      writer.write_string("bonus", "none");
+      writer.write("bonus", "none");
       break;
     case GROWUP_BONUS:
-      writer.write_string("bonus", "growup");
+      writer.write("bonus", "growup");
       break;
     case FIRE_BONUS:
-      writer.write_string("bonus", "fireflower");
+      writer.write("bonus", "fireflower");
       break;
     case ICE_BONUS:
-      writer.write_string("bonus", "iceflower");
+      writer.write("bonus", "iceflower");
       break;
     default:
       log_warning << "Unknown bonus type." << std::endl;
-      writer.write_string("bonus", "none");
+      writer.write("bonus", "none");
   }
-  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);
+  writer.write("fireflowers", max_fire_bullets);
+  writer.write("iceflowers", max_ice_bullets);
+
+  writer.write("coins", coins);
 }
 
 void
 PlayerStatus::read(const lisp::Lisp& lisp)
 {
   reset();
-  
+
   std::string bonusname;
   if(lisp.get("bonus", bonusname)) {
     if(bonusname == "none") {
@@ -124,22 +126,36 @@ PlayerStatus::read(const lisp::Lisp& lisp)
   lisp.get("iceflowers", max_ice_bullets);
 
   lisp.get("coins", coins);
-  lisp.get("max-score-multiplier", max_score_multiplier);
 }
 
 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);
-  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() - fixed_font->get_text_width(coins_text), BORDER_Y + 1), LAYER_HUD);
+  }
+  context.draw_text(fixed_font, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT, LAYER_HUD, PlayerStatus::text_color);
 
   context.pop_transform();
 }
@@ -149,21 +165,4 @@ PlayerStatus::operator= (const PlayerStatus& other)
 {
   coins = other.coins;
   bonus = other.bonus;
-  score_multiplier = other.score_multiplier;
-  max_score_multiplier = other.max_score_multiplier;
-}
-
-bool
-PlayerStatus::consoleCommand(std::string command, std::vector<std::string> arguments)
-{
-  if (command == "coins") {
-    if ((arguments.size() < 1) || (!Console::string_is<int>(arguments[0]))) {
-      log_info << "Usage: coins <number>" << std::endl;
-    } else {
-      coins = Console::string_to<int>(arguments[0]);
-    }
-    return true;
-  }
-  return false;
 }
-