projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
84925da
..
bb00f83
100644
(file)
--- a/
src/player_status.cpp
+++ b/
src/player_status.cpp
@@
-34,7
+34,7
@@
#include "timer.hpp"
static const int START_COINS = 100;
#include "timer.hpp"
static const int START_COINS = 100;
-static const int MAX_COINS = 9999
9
;
+static const int MAX_COINS = 9999;
PlayerStatus* player_status = 0;
PlayerStatus* player_status = 0;
@@
-42,9
+42,7
@@
PlayerStatus::PlayerStatus()
: coins(START_COINS),
bonus(NO_BONUS),
max_fire_bullets(0),
: coins(START_COINS),
bonus(NO_BONUS),
max_fire_bullets(0),
- max_ice_bullets(0),
- score_multiplier(1),
- max_score_multiplier(1)
+ max_ice_bullets(0)
{
reset();
{
reset();
@@
-61,8
+59,6
@@
void PlayerStatus::reset()
{
coins = START_COINS;
bonus = NO_BONUS;
{
coins = START_COINS;
bonus = NO_BONUS;
- score_multiplier = 1;
- max_score_multiplier = 1;
}
void
}
void
@@
-85,26
+81,25
@@
PlayerStatus::write(lisp::Writer& writer)
{
switch(bonus) {
case NO_BONUS:
{
switch(bonus) {
case NO_BONUS:
- writer.write
_string
("bonus", "none");
+ writer.write("bonus", "none");
break;
case GROWUP_BONUS:
break;
case GROWUP_BONUS:
- writer.write
_string
("bonus", "growup");
+ writer.write("bonus", "growup");
break;
case FIRE_BONUS:
break;
case FIRE_BONUS:
- writer.write
_string
("bonus", "fireflower");
+ writer.write("bonus", "fireflower");
break;
case ICE_BONUS:
break;
case ICE_BONUS:
- writer.write
_string
("bonus", "iceflower");
+ writer.write("bonus", "iceflower");
break;
default:
log_warning << "Unknown bonus type." << std::endl;
break;
default:
log_warning << "Unknown bonus type." << std::endl;
- writer.write
_string
("bonus", "none");
+ writer.write("bonus", "none");
}
}
- writer.write
_int
("fireflowers", max_fire_bullets);
- writer.write
_int
("iceflowers", max_ice_bullets);
+ writer.write("fireflowers", max_fire_bullets);
+ writer.write("iceflowers", max_ice_bullets);
- writer.write_int("coins", coins);
- writer.write_int("max-score-multiplier", max_score_multiplier);
+ writer.write("coins", coins);
}
void
}
void
@@
-131,7
+126,6
@@
PlayerStatus::read(const lisp::Lisp& lisp)
lisp.get("iceflowers", max_ice_bullets);
lisp.get("coins", coins);
lisp.get("iceflowers", max_ice_bullets);
lisp.get("coins", coins);
- lisp.get("max-score-multiplier", max_score_multiplier);
}
void
}
void
@@
-171,6
+165,4
@@
PlayerStatus::operator= (const PlayerStatus& other)
{
coins = other.coins;
bonus = other.bonus;
{
coins = other.coins;
bonus = other.bonus;
- score_multiplier = other.score_multiplier;
- max_score_multiplier = other.max_score_multiplier;
}
}