X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=bb00f83edf63be8f3e3bdb6470968e859be1b6ad;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=84925da0cc5495b84a89605c4139fbf9939a2ba0;hpb=88044088f138f9f6bdaaaf873f114f34f053c864;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 84925da0c..bb00f83ed 100644
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -34,7 +34,7 @@
 #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;
 
@@ -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
@@ -85,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
@@ -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;
 }