projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yeti summons snowballs now
[supertux.git]
/
src
/
object
/
flower.cpp
diff --git
a/src/object/flower.cpp
b/src/object/flower.cpp
index
435be07
..
d406592
100644
(file)
--- a/
src/object/flower.cpp
+++ b/
src/object/flower.cpp
@@
-2,7
+2,6
@@
#include <math.h>
#include "flower.h"
#include <math.h>
#include "flower.h"
-#include "defines.h"
#include "resources.h"
#include "camera.h"
#include "sector.h"
#include "resources.h"
#include "camera.h"
#include "sector.h"
@@
-46,9
+45,10
@@
Flower::collision(GameObject& other, const CollisionHit& )
return ABORT_MOVE;
if(type == FIREFLOWER)
return ABORT_MOVE;
if(type == FIREFLOWER)
- player->
got_power = Player::FIRE_POWER
;
+ player->
set_bonus(FIRE_BONUS, true)
;
else
else
- player->got_power = Player::ICE_POWER;
+ player->set_bonus(ICE_BONUS, true);
+
SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
remove_me();
return ABORT_MOVE;
SoundManager::get()->play_sound(IDToSound(SND_COFFEE));
remove_me();
return ABORT_MOVE;