Colors patch from qmax ( + added stat_hdr_color into levelintro.hpp...)

[supertux.git] / src / player_status.cpp

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 95a1c11..84925da 100644 (file)
--- 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,6 +31,7 @@
 #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;
@@ -47,8 +49,8 @@ PlayerStatus::PlayerStatus()
   reset();
 
   coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
-
-  Console::instance->registerCommand("coins", this);
+  sound_manager->preload("sounds/coin.wav");
+  sound_manager->preload("sounds/lifeup.wav");
 }
 
 PlayerStatus::~PlayerStatus()
@@ -66,12 +68,15 @@ void PlayerStatus::reset()
 void
 PlayerStatus::add_coins(int count, bool play_sound)
 {
+  static float sound_played_time = 0;
   coins = std::min(coins + count, MAX_COINS);
   if(play_sound) {
     if(count >= 100)
       sound_manager->play("sounds/lifeup.wav");
-    else
+    else if (real_time > sound_played_time + 0.010) {
       sound_manager->play("sounds/coin.wav");
+      sound_played_time = real_time;
+    }
   }
 }
 
@@ -135,7 +140,9 @@ PlayerStatus::draw(DrawingContext& context)
   static int displayed_coins = -1;
   static int next_count = 0;
 
-  if (displayed_coins == -1) displayed_coins = coins;
+  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++;
@@ -152,9 +159,9 @@ PlayerStatus::draw(DrawingContext& 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_HUD);
+    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(gold_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, 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();
 }
@@ -167,17 +174,3 @@ PlayerStatus::operator= (const PlayerStatus& other)
   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;
-}