X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=bb00f83edf63be8f3e3bdb6470968e859be1b6ad;hb=53658c421bfe7148cb2781b793b194b4668a11ff;hp=352fac3d5fcce373b2ac52f96aae690d1038c026;hpb=82895aabbae07b59a19e09a61ca94cd7b1603702;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 352fac3d5..bb00f83ed 100644
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -31,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;
 
@@ -41,13 +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();
 
   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()
@@ -58,19 +59,20 @@ void PlayerStatus::reset()
 {
   coins = START_COINS;
   bonus = NO_BONUS;
-  score_multiplier = 1;
-  max_score_multiplier = 1;
 }
 
 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;
+    }
   }
 }
 
@@ -79,26 +81,25 @@ 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("fireflowers", max_fire_bullets);
+  writer.write("iceflowers", max_ice_bullets);
 
-  writer.write_int("coins", coins);
-  writer.write_int("max-score-multiplier", max_score_multiplier);
+  writer.write("coins", coins);
 }
 
 void
@@ -125,7 +126,6 @@ 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
@@ -153,9 +153,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_fixed_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_fixed_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT, 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();
 }
@@ -165,6 +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;
 }