projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify physic formula a bit
[supertux.git]
/
src
/
player_status.cpp
diff --git
a/src/player_status.cpp
b/src/player_status.cpp
index
8279e17
..
4bed7df
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;
@@
-48,6
+49,8
@@
PlayerStatus::PlayerStatus()
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()
@@
-65,12
+68,15
@@
void PlayerStatus::reset()
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;
+ }
}
}
}
}
@@
-153,9
+159,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_text->get_text_width(coins_text), BORDER_Y + 1), LAYER_HUD);
+ context.draw_surface(coin_surf, Vector(SCREEN_WIDTH - BORDER_X - coin_surf->get_width() - gold_
fixed_
text->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(gold_
fixed_text, coins_text, Vector(SCREEN_WIDTH - BORDER_X, BORDER_Y), ALIGN_RIGHT
, LAYER_HUD);
context.pop_transform();
}
context.pop_transform();
}
@@
-168,4
+174,3
@@
PlayerStatus::operator= (const PlayerStatus& other)
score_multiplier = other.score_multiplier;
max_score_multiplier = other.max_score_multiplier;
}
score_multiplier = other.score_multiplier;
max_score_multiplier = other.max_score_multiplier;
}
-