fix growup, lightmap experiments with willowisp

[supertux.git] / src / player_status.cpp

diff --git a/src/player_status.cpp b/src/player_status.cpp
index 1e37c7c..8241b9b 100644 (file)
--- a/src/player_status.cpp
+++ b/src/player_status.cpp
@@ -28,6 +28,7 @@
 #include "sprite/sprite_manager.hpp"
 #include "math/vector.hpp"
 #include "main.hpp"
+#include "msg.hpp"
 
 static const int START_LIVES = 4;
 static const int MAX_LIVES = 99;
@@ -42,11 +43,11 @@ PlayerStatus::PlayerStatus()
     max_score_multiplier(1)
 {
   reset();
-  key_brass = sprite_manager->create("key-brass");
-  key_iron = sprite_manager->create("key-iron");
-  key_bronze = sprite_manager->create("key-bronze");
-  key_silver = sprite_manager->create("key-silver");
-  key_gold = sprite_manager->create("key-gold");
+  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->set_action("outline");
   key_iron->set_action("outline");
   key_bronze->set_action("outline");
@@ -120,7 +121,7 @@ PlayerStatus::write(lisp::Writer& writer)
       writer.write_string("bonus", "iceflower");
       break;
     default:
-      std::cerr << "Unknown bonus type.\n";
+      msg_warning("Unknown bonus type.");
       writer.write_string("bonus", "none");
   }
   writer.write_bool("key-brass", keys & KEY_BRASS);
@@ -150,7 +151,7 @@ PlayerStatus::read(const lisp::Lisp& lisp)
     } else if(bonusname == "iceflower") {
       bonus = ICE_BONUS;
     } else {
-      std::cerr << "Unknown bonus '" << bonusname << "' in savefile.\n";
+      msg_warning("Unknown bonus '" << bonusname << "' in savefile");
       bonus = NO_BONUS;
     }
   }