From: Ingo Ruhnke Date: Mon, 2 Mar 2009 23:34:32 +0000 (+0000) Subject: Removed unused max_score_multiplier and score_multiplier X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e126dd8c3da286ab759dc36f3f59f3955e16ed09;p=supertux.git Removed unused max_score_multiplier and score_multiplier SVN-Revision: 5841 --- diff --git a/src/player_status.cpp b/src/player_status.cpp index 84925da0c..09b9efa9e 100644 --- a/src/player_status.cpp +++ b/src/player_status.cpp @@ -42,9 +42,7 @@ 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(); @@ -61,8 +59,6 @@ void PlayerStatus::reset() { coins = START_COINS; bonus = NO_BONUS; - score_multiplier = 1; - max_score_multiplier = 1; } void @@ -104,7 +100,6 @@ PlayerStatus::write(lisp::Writer& writer) writer.write_int("iceflowers", max_ice_bullets); writer.write_int("coins", coins); - writer.write_int("max-score-multiplier", max_score_multiplier); } void @@ -131,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 @@ -171,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; } diff --git a/src/player_status.hpp b/src/player_status.hpp index 520bd7423..1840ab8ea 100644 --- a/src/player_status.hpp +++ b/src/player_status.hpp @@ -59,9 +59,6 @@ public: int max_fire_bullets; /**< maximum number of fire bullets in play */ int max_ice_bullets; /**< maximum number of ice bullets in play */ - int score_multiplier; - int max_score_multiplier; - void operator= (const PlayerStatus& other); private: