projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved over some changes from cvs
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
ba8b633
..
de5b7df
100644
(file)
--- a/
src/player_status.cpp
+++ b/
src/player_status.cpp
@@
-69,15
+69,18
@@
void
PlayerStatus::write(lisp::Writer& writer)
{
switch(bonus) {
PlayerStatus::write(lisp::Writer& writer)
{
switch(bonus) {
- case
PlayerStatus::
NO_BONUS:
+ case NO_BONUS:
writer.write_string("bonus", "none");
break;
writer.write_string("bonus", "none");
break;
- case
PlayerStatus::
GROWUP_BONUS:
+ case GROWUP_BONUS:
writer.write_string("bonus", "growup");
break;
writer.write_string("bonus", "growup");
break;
- case
PlayerStatus::FLOWER
_BONUS:
+ case
FIRE
_BONUS:
writer.write_string("bonus", "fireflower");
break;
writer.write_string("bonus", "fireflower");
break;
+ case ICE_BONUS:
+ writer.write_string("bonus", "iceflower");
+ break;
default:
std::cerr << "Unknown bonus type.\n";
writer.write_string("bonus", "none");
default:
std::cerr << "Unknown bonus type.\n";
writer.write_string("bonus", "none");
@@
-100,7
+103,9
@@
PlayerStatus::read(const lisp::Lisp& lisp)
} else if(bonusname == "growup") {
bonus = GROWUP_BONUS;
} else if(bonusname == "fireflower") {
} else if(bonusname == "growup") {
bonus = GROWUP_BONUS;
} else if(bonusname == "fireflower") {
- bonus = FLOWER_BONUS;
+ bonus = FIRE_BONUS;
+ } else if(bonusname == "iceflower") {
+ bonus = ICE_BONUS;
} else {
std::cerr << "Unknown bonus '" << bonusname << "' in savefile.\n";
bonus = NO_BONUS;
} else {
std::cerr << "Unknown bonus '" << bonusname << "' in savefile.\n";
bonus = NO_BONUS;