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
/
object
/
magicblock.cpp
diff --git
a/src/object/magicblock.cpp
b/src/object/magicblock.cpp
index
9064d5d
..
2b9ffe2
100644
(file)
--- a/
src/object/magicblock.cpp
+++ b/
src/object/magicblock.cpp
@@
-157,7
+157,7
@@
MagicBlock::collides(GameObject& /*other*/, const CollisionHit& /*hit*/)
HitResponse
MagicBlock::collision(GameObject& /*other*/, const CollisionHit& /*hit*/)
{
- return
SOLID
;
+ return
FORCE_MOVE
;
}
IMPLEMENT_FACTORY(MagicBlock, "magicblock");