projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding re-ordered data directories
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
ba8b633
..
6fcf66c
100644
(file)
--- a/
src/player_status.cpp
+++ b/
src/player_status.cpp
@@
-29,7
+29,7
@@
static const int MAX_LIVES = 99;
PlayerStatus player_status;
PlayerStatus::PlayerStatus()
PlayerStatus player_status;
PlayerStatus::PlayerStatus()
- :
distro
s(0),
+ :
coin
s(0),
lives(START_LIVES),
bonus(NO_BONUS),
score_multiplier(1),
lives(START_LIVES),
bonus(NO_BONUS),
score_multiplier(1),
@@
-39,7
+39,7
@@
PlayerStatus::PlayerStatus()
void PlayerStatus::reset()
{
void PlayerStatus::reset()
{
-
distro
s = 0;
+
coin
s = 0;
lives = START_LIVES;
bonus = NO_BONUS;
score_multiplier = 1;
lives = START_LIVES;
bonus = NO_BONUS;
score_multiplier = 1;
@@
-51,40
+51,43
@@
PlayerStatus::incLives()
{
if(lives < MAX_LIVES)
++lives;
{
if(lives < MAX_LIVES)
++lives;
-
SoundManager::get()->play_sound(IDToSound(SND_LIFEUP)
);
+
sound_manager->play_sound("lifeup"
);
}
void
PlayerStatus::incCoins()
{
}
void
PlayerStatus::incCoins()
{
-
distro
s++;
- if(
distro
s >= 100) {
+
coin
s++;
+ if(
coin
s >= 100) {
incLives();
incLives();
-
distro
s = 0;
+
coin
s = 0;
}
}
-
SoundManager::get()->play_sound(IDToSound(SND_DISTRO)
);
+
sound_manager->play_sound("coin"
);
}
void
PlayerStatus::write(lisp::Writer& writer)
{
switch(bonus) {
}
void
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");
}
writer.write_int("lives", lives);
default:
std::cerr << "Unknown bonus type.\n";
writer.write_string("bonus", "none");
}
writer.write_int("lives", lives);
- writer.write_int("
distros", distro
s);
+ writer.write_int("
coins", coin
s);
writer.write_int("max-score-multiplier", max_score_multiplier);
}
writer.write_int("max-score-multiplier", max_score_multiplier);
}
@@
-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;
@@
-108,7
+113,7
@@
PlayerStatus::read(const lisp::Lisp& lisp)
}
lisp.get("lives", lives);
}
lisp.get("lives", lives);
- lisp.get("
distros", distro
s);
+ lisp.get("
coins", coin
s);
lisp.get("max-score-multiplier", max_score_multiplier);
}
lisp.get("max-score-multiplier", max_score_multiplier);
}