projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve exception feedback a bit
[supertux.git]
/
src
/
scene.cpp
diff --git
a/src/scene.cpp
b/src/scene.cpp
index
7c35614
..
a235035
100644
(file)
--- a/
src/scene.cpp
+++ b/
src/scene.cpp
@@
-20,26
+20,26
@@
#include <cstdlib>
#include "scene.h"
#include <cstdlib>
#include "scene.h"
-#include "
app/
defines.h"
+#include "defines.h"
PlayerStatus player_status;
PlayerStatus::PlayerStatus()
PlayerStatus player_status;
PlayerStatus::PlayerStatus()
- : score(0),
- distros(0),
+ : distros(0),
lives(START_LIVES),
bonus(NO_BONUS),
lives(START_LIVES),
bonus(NO_BONUS),
- score_multiplier(1)
+ score_multiplier(1),
+ max_score_multiplier(1)
{
}
void PlayerStatus::reset()
{
{
}
void PlayerStatus::reset()
{
- score = 0;
distros = 0;
lives = START_LIVES;
bonus = NO_BONUS;
score_multiplier = 1;
distros = 0;
lives = START_LIVES;
bonus = NO_BONUS;
score_multiplier = 1;
+ max_score_multiplier = 1;
}
std::string bonus_to_string(PlayerStatus::BonusType b)
}
std::string bonus_to_string(PlayerStatus::BonusType b)