X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux%2Fplayer_status.cpp;h=281c809e43b675f88ab2accaca1a963f817e66f3;hb=78ac7aef674f518549f96160c6354b589553f952;hp=28a68729b6d3d462c1a137d2b02b3369ca6e2a81;hpb=08813a74da6ac1fd045a105e4e8105f1d7f716f0;p=supertux.git diff --git a/src/supertux/player_status.cpp b/src/supertux/player_status.cpp index 28a68729b..281c809e4 100644 --- a/src/supertux/player_status.cpp +++ b/src/supertux/player_status.cpp @@ -18,12 +18,12 @@ #include #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 */