projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...
[supertux.git]
/
src
/
badguy
/
stalactite.cpp
diff --git
a/src/badguy/stalactite.cpp
b/src/badguy/stalactite.cpp
index
6117e2d
..
8bde2fb
100644
(file)
--- a/
src/badguy/stalactite.cpp
+++ b/
src/badguy/stalactite.cpp
@@
-99,7
+99,7
@@
Stalactite::collision_player(Player& player)
return FORCE_MOVE;
}
return FORCE_MOVE;
}
-HitResponse
+HitResponse
Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
{
if (state == STALACTITE_SQUISHED) return FORCE_MOVE;
Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
{
if (state == STALACTITE_SQUISHED) return FORCE_MOVE;
@@
-130,7
+130,7
@@
Stalactite::draw(DrawingContext& context)
if(get_state() != STATE_ACTIVE)
return;
if(get_state() != STATE_ACTIVE)
return;
-
+
if(state == STALACTITE_SQUISHED) {
sprite->draw(context, get_pos(), LAYER_OBJECTS);
return;
if(state == STALACTITE_SQUISHED) {
sprite->draw(context, get_pos(), LAYER_OBJECTS);
return;