projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
* Make it compile again
[supertux.git]
/
src
/
badguy
/
mriceblock.cpp
diff --git
a/src/badguy/mriceblock.cpp
b/src/badguy/mriceblock.cpp
index
f056d4a
..
4d3bca7
100644
(file)
--- a/
src/badguy/mriceblock.cpp
+++ b/
src/badguy/mriceblock.cpp
@@
-134,9
+134,6
@@
MrIceBlock::collision(GameObject& object, const CollisionHit& hit)
HitResponse
MrIceBlock::collision_player(Player& player, const CollisionHit& hit)
{
- if(ice_state == ICESTATE_GRABBED)
- return FORCE_MOVE;
-
if(dir == UP) {
return FORCE_MOVE;
}