projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- updated TODO
[supertux.git]
/
src
/
scene.cpp
diff --git
a/src/scene.cpp
b/src/scene.cpp
index
fccff6f
..
0ee4d1c
100644
(file)
--- a/
src/scene.cpp
+++ b/
src/scene.cpp
@@
-27,11
+27,20
@@
PlayerStatus::PlayerStatus()
: score(0),
distros(0),
lives(START_LIVES),
: score(0),
distros(0),
lives(START_LIVES),
-
score_multiplier(1
),
-
bonus(NO_BONUS
)
+
bonus(NO_BONUS
),
+
score_multiplier(1
)
{
}
{
}
+void PlayerStatus::reset()
+{
+ score = 0;
+ distros = 0;
+ lives = START_LIVES;
+ bonus = NO_BONUS;
+ score_multiplier = 1;
+}
+
std::string bonus_to_string(PlayerStatus::BonusType b)
{
switch (b)
std::string bonus_to_string(PlayerStatus::BonusType b)
{
switch (b)
@@
-42,6
+51,8
@@
std::string bonus_to_string(PlayerStatus::BonusType b)
return "growup";
case PlayerStatus::FLOWER_BONUS:
return "icflower";
return "growup";
case PlayerStatus::FLOWER_BONUS:
return "icflower";
+ default:
+ return "none";
}
}
}
}
@@
-57,9
+68,6
@@
PlayerStatus::BonusType string_to_bonus(const std::string& str)
return PlayerStatus::NO_BONUS;
}
return PlayerStatus::NO_BONUS;
}
-// FIXME: Move this into a view class
-float scroll_x;
-
unsigned int global_frame_counter;
// EOF //
unsigned int global_frame_counter;
// EOF //