Switched from tinygettext/tags/tinygetext-supertux/ to tinygettext/trunk/

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

diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp
index 28a6872..281c809 100644 (file)
--- a/src/supertux/player_status.cpp
+++ b/src/supertux/player_status.cpp
@@ -18,12 +18,12 @@
 #include <math.h>
 
 #include "audio/sound_manager.hpp"
-#include "lisp/lisp.hpp"
 #include "util/writer.hpp"
-#include "supertux/main.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;
@@ -31,11 +31,12 @@ static const int MAX_COINS = 9999;
 
 PlayerStatus* player_status = 0;
 
-PlayerStatus::PlayerStatus()
-  : coins(START_COINS),
-    bonus(NO_BONUS),
-    max_fire_bullets(0),
-    max_ice_bullets(0)
+PlayerStatus::PlayerStatus() :
+  coins(START_COINS),
+  bonus(NO_BONUS),
+  max_fire_bullets(0),
+  max_ice_bullets(0),
+  coin_surface()
 {
   reset();
 
@@ -153,11 +154,4 @@ PlayerStatus::draw(DrawingContext& context)
   context.pop_transform();
 }
 
-void
-PlayerStatus::operator= (const PlayerStatus& other)
-{
-  coins = other.coins;
-  bonus = other.bonus;
-}
-
 /* EOF */