projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure all tiles are loaded
[supertux.git]
/
src
/
object
/
growup.cpp
diff --git
a/src/object/growup.cpp
b/src/object/growup.cpp
index
a7f7482
..
3f37e0f
100644
(file)
--- a/
src/object/growup.cpp
+++ b/
src/object/growup.cpp
@@
-2,7
+2,6
@@
#include <math.h>
#include "growup.h"
#include <math.h>
#include "growup.h"
-#include "defines.h"
#include "resources.h"
#include "camera.h"
#include "sector.h"
#include "resources.h"
#include "camera.h"
#include "sector.h"
@@
-35,7
+34,7
@@
HitResponse
GrowUp::collision(GameObject& other, const CollisionHit& hit)
{
if(other.get_flags() & FLAG_SOLID) {
GrowUp::collision(GameObject& other, const CollisionHit& hit)
{
if(other.get_flags() & FLAG_SOLID) {
- if(fabsf(hit.normal.y) > .5) { // roof
+ if(fabsf(hit.normal.y) > .5) { // roof
or ground
physic.set_velocity_y(0);
} else { // bumped left or right
physic.set_velocity_x(-physic.get_velocity_x());
physic.set_velocity_y(0);
} else { // bumped left or right
physic.set_velocity_x(-physic.get_velocity_x());
@@
-46,7
+45,7
@@
GrowUp::collision(GameObject& other, const CollisionHit& hit)
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
- player->
grow(
);
+ player->
set_bonus(GROWUP_BONUS, true
);
SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
remove_me();
SoundManager::get()->play_sound(IDToSound(SND_EXCELLENT));
remove_me();