projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unified Messaging Subsystem
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
bc51aee
..
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 "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;
static const int START_LIVES = 4;
static const int MAX_LIVES = 99;
@@
-120,7
+121,7
@@
PlayerStatus::write(lisp::Writer& writer)
writer.write_string("bonus", "iceflower");
break;
default:
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);
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 {
} 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;
}
}
bonus = NO_BONUS;
}
}