X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fplayer_status.cpp;h=432640cbfb219193c23d3dfd4c29ac6210529326;hb=4f011ba68aed4c9775cdfb69f19c5daf66101dcb;hp=f5c721f6414301076ac5a59b20674f950126701d;hpb=852dd1382ce743c7f999b8e8d2bd551bbd629bcc;p=supertux.git

diff --git a/src/player_status.cpp b/src/player_status.cpp
index f5c721f64..432640cbf 100644
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -1,7 +1,8 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
+//  SuperTux
 //  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -28,7 +29,7 @@
 #include "sprite/sprite_manager.hpp"
 #include "math/vector.hpp"
 #include "main.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 
 static const int START_COINS = 100;
 static const int MAX_COINS = 99999;
@@ -38,29 +39,30 @@ PlayerStatus* player_status = 0;
 PlayerStatus::PlayerStatus()
   : coins(START_COINS),
     bonus(NO_BONUS),
+    max_fire_bullets(0),
+    max_ice_bullets(0),
     score_multiplier(1),
     max_score_multiplier(1)
 {
   reset();
-  key_brass = sprite_manager->create("images/objects/keys/key_brass.sprite");
-  key_iron = sprite_manager->create("images/objects/keys/key_iron.sprite");
-  key_bronze = sprite_manager->create("images/objects/keys/key_bronze.sprite");
-  key_silver = sprite_manager->create("images/objects/keys/key_silver.sprite");
-  key_gold = sprite_manager->create("images/objects/keys/key_gold.sprite");
+  key_brass.reset(sprite_manager->create("images/objects/keys/key_brass.sprite"));
+  key_iron.reset(sprite_manager->create("images/objects/keys/key_iron.sprite"));
+  key_bronze.reset(sprite_manager->create("images/objects/keys/key_bronze.sprite"));
+  key_silver.reset(sprite_manager->create("images/objects/keys/key_silver.sprite"));
+  key_gold.reset(sprite_manager->create("images/objects/keys/key_gold.sprite"));
   key_brass->set_action("outline");
   key_iron->set_action("outline");
   key_bronze->set_action("outline");
   key_silver->set_action("outline");
   key_gold->set_action("outline");
+  
+  tux_life.reset(sprite_manager->create("images/creatures/tux_small/tux-life.sprite"));
+
+  Console::instance->registerCommand("coins", this);
 }
 
 PlayerStatus::~PlayerStatus()
 {
-  delete key_brass;
-  delete key_iron;
-  delete key_bronze;
-  delete key_silver;
-  delete key_gold;
 }
 
 void PlayerStatus::reset()
@@ -73,17 +75,13 @@ void PlayerStatus::reset()
 }
 
 void
-PlayerStatus::incLives()
+PlayerStatus::add_coins(int count)
 {
-  player_status->coins = std::min(player_status->coins+100, MAX_COINS);
-  sound_manager->play("sounds/lifeup.wav");
-}
-
-void
-PlayerStatus::incCoins()
-{
-  coins++;
-  sound_manager->play("sounds/coin.wav");
+  coins = std::min(coins + count, MAX_COINS);
+  if(count > 100)
+    sound_manager->play("sounds/lifeup.wav");
+  else
+    sound_manager->play("sounds/coin.wav");
 }
 
 void
@@ -114,9 +112,12 @@ PlayerStatus::write(lisp::Writer& writer)
       writer.write_string("bonus", "iceflower");
       break;
     default:
-      msg_warning("Unknown bonus type.");
+      log_warning << "Unknown bonus type." << std::endl;
       writer.write_string("bonus", "none");
   }
+  writer.write_int("fireflowers", max_fire_bullets);
+  writer.write_int("iceflowers", max_ice_bullets);
+  
   writer.write_bool("key-brass", keys & KEY_BRASS);
   writer.write_bool("key-iron", keys & KEY_IRON);
   writer.write_bool("key-bronze", keys & KEY_BRONZE);
@@ -143,10 +144,13 @@ PlayerStatus::read(const lisp::Lisp& lisp)
     } else if(bonusname == "iceflower") {
       bonus = ICE_BONUS;
     } else {
-      msg_warning("Unknown bonus '" << bonusname << "' in savefile");
+      log_warning << "Unknown bonus '" << bonusname << "' in savefile" << std::endl;
       bonus = NO_BONUS;
     }
   }
+  lisp.get("fireflowers", max_fire_bullets);
+  lisp.get("iceflowers", max_ice_bullets);
+
   bool val = false;
   if(lisp.get("key-brass", val) && val == true)
     set_keys(KEY_BRASS);
@@ -210,3 +214,17 @@ PlayerStatus::operator= (const PlayerStatus& other)
   keys = other.keys;
 }
 
+bool
+PlayerStatus::consoleCommand(std::string command, std::vector<std::string> arguments)
+{
+  if (command == "coins") {
+    if ((arguments.size() < 1) || (!Console::string_is<int>(arguments[0]))) {
+      log_info << "Usage: coins <number>" << std::endl;
+    } else {
+      coins = Console::string_to<int>(arguments[0]);
+    }
+    return true;
+  }
+  return false;
+}
+