Bug 508: Make PlayerStatus::reset reset displayed_coins.

[supertux.git] / src / supertux / player_status.cpp

diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp
index 97a124d..b1e5090 100644 (file)
--- a/src/supertux/player_status.cpp
+++ b/src/supertux/player_status.cpp
@@ -16,31 +16,37 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <math.h>
+#include <sstream>
 
 #include "audio/sound_manager.hpp"
-#include "lisp/lisp.hpp"
 #include "util/writer.hpp"
 #include "supertux/globals.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/resources.hpp"
 #include "supertux/timer.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 
 static const int START_COINS = 100;
 static const int MAX_COINS = 9999;
 
+static const int DISPLAYED_COINS_UNSET = -1;
+
 PlayerStatus* player_status = 0;
 
 PlayerStatus::PlayerStatus() :
+  /* Do we really want -Weffc++ to bully us into duplicating code from "reset" here? */
   coins(START_COINS),
   bonus(NO_BONUS),
   max_fire_bullets(0),
   max_ice_bullets(0),
+  displayed_coins(DISPLAYED_COINS_UNSET),
+  displayed_coins_frame(0),
   coin_surface()
 {
   reset();
 
-  coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
+  coin_surface = Surface::create("images/engine/hud/coins-0.png");
   sound_manager->preload("sounds/coin.wav");
   sound_manager->preload("sounds/lifeup.wav");
 }
@@ -53,6 +59,7 @@ void PlayerStatus::reset()
 {
   coins = START_COINS;
   bonus = NO_BONUS;
+  displayed_coins = DISPLAYED_COINS_UNSET;
 }
 
 void
@@ -125,14 +132,14 @@ PlayerStatus::read(const Reader& 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)) {
+  if ((displayed_coins == DISPLAYED_COINS_UNSET) ||
+      (fabsf(displayed_coins - coins) > 100)) {
     displayed_coins = coins;
+    displayed_coins_frame = 0;
   }
-  if (++next_count > 2) {
-    next_count = 0;
+  if (++displayed_coins_frame > 2) {
+    displayed_coins_frame = 0;
     if (displayed_coins < coins) displayed_coins++;
     if (displayed_coins > coins) displayed_coins--;
   }
@@ -145,11 +152,14 @@ PlayerStatus::draw(DrawingContext& context)
   context.push_transform();
   context.set_translation(Vector(0, 0));
 
-  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);
+  if (coin_surface)
+  {
+    context.draw_surface(coin_surface, 
+                         Vector(SCREEN_WIDTH - BORDER_X - coin_surface->get_width() - Resources::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.draw_text(Resources::fixed_font, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT, LAYER_HUD, PlayerStatus::text_color);
 
   context.pop_transform();
 }