projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added type checking for __custom functions
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
1f233bd
..
09b9efa
100644
(file)
--- a/
src/player_status.cpp
+++ b/
src/player_status.cpp
@@
-31,6
+31,7
@@
#include "math/vector.hpp"
#include "main.hpp"
#include "log.hpp"
#include "math/vector.hpp"
#include "main.hpp"
#include "log.hpp"
+#include "timer.hpp"
static const int START_COINS = 100;
static const int MAX_COINS = 99999;
static const int START_COINS = 100;
static const int MAX_COINS = 99999;
@@
-41,13
+42,13
@@
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();
coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
{
reset();
coin_surface.reset(new Surface("images/engine/hud/coins-0.png"));
+ sound_manager->preload("sounds/coin.wav");
+ sound_manager->preload("sounds/lifeup.wav");
}
PlayerStatus::~PlayerStatus()
}
PlayerStatus::~PlayerStatus()
@@
-58,19
+59,20
@@
void PlayerStatus::reset()
{
coins = START_COINS;
bonus = NO_BONUS;
{
coins = START_COINS;
bonus = NO_BONUS;
- score_multiplier = 1;
- max_score_multiplier = 1;
}
void
PlayerStatus::add_coins(int count, bool play_sound)
{
}
void
PlayerStatus::add_coins(int count, bool play_sound)
{
+ static float sound_played_time = 0;
coins = std::min(coins + count, MAX_COINS);
if(play_sound) {
if(count >= 100)
sound_manager->play("sounds/lifeup.wav");
coins = std::min(coins + count, MAX_COINS);
if(play_sound) {
if(count >= 100)
sound_manager->play("sounds/lifeup.wav");
- else
+ else
if (real_time > sound_played_time + 0.010) {
sound_manager->play("sounds/coin.wav");
sound_manager->play("sounds/coin.wav");
+ sound_played_time = real_time;
+ }
}
}
}
}
@@
-98,7
+100,6
@@
PlayerStatus::write(lisp::Writer& writer)
writer.write_int("iceflowers", max_ice_bullets);
writer.write_int("coins", coins);
writer.write_int("iceflowers", max_ice_bullets);
writer.write_int("coins", coins);
- writer.write_int("max-score-multiplier", max_score_multiplier);
}
void
}
void
@@
-125,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
@@
-153,9
+153,9
@@
PlayerStatus::draw(DrawingContext& context)
Surface* coin_surf = coin_surface.get();
if (coin_surf) {
Surface* coin_surf = coin_surface.get();
if (coin_surf) {
- context.draw_surface(coin_surf, Vector(SCREEN_WIDTH - BORDER_X - coin_surf->get_width() -
gold_tex
t->get_text_width(coins_text), BORDER_Y + 1), LAYER_HUD);
+ context.draw_surface(coin_surf, Vector(SCREEN_WIDTH - BORDER_X - coin_surf->get_width() -
fixed_fon
t->get_text_width(coins_text), BORDER_Y + 1), LAYER_HUD);
}
}
- context.draw_text(
gold_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), RIGHT_ALLIGN, LAYER_HUD
);
+ context.draw_text(
fixed_font, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT, LAYER_HUD, PlayerStatus::text_color
);
context.pop_transform();
}
context.pop_transform();
}
@@
-165,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;
}
}