fixed solid water for tux
authorMarek Moeckel <wansti@gmx.de>
Sat, 17 Sep 2005 19:37:17 +0000 (19:37 +0000)
committerMarek Moeckel <wansti@gmx.de>
Sat, 17 Sep 2005 19:37:17 +0000 (19:37 +0000)
fixed hurt sound

SVN-Revision: 2767

data/sounds/hurt.wav
src/object/player.cpp

index 20537c3..1efb76f 100644 (file)
Binary files a/data/sounds/hurt.wav and b/data/sounds/hurt.wav differ
index 13121b5..9b370c5 100644 (file)
@@ -772,7 +772,7 @@ Player::collision(GameObject& other, const CollisionHit& hit)
         kill(SHRINK);
 
       if(! (thit->tileflags & Tile::SOLID))
-        return CONTINUE;
+        return FORCE_MOVE;
     }
     
     if(hit.normal.y < 0) { // landed on floor?