From: Marek Moeckel <wansti@gmx.de>
Date: Sat, 17 Sep 2005 19:37:17 +0000 (+0000)
Subject: fixed solid water for tux
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9e335df4e539eee518424b381378b35646f651a8;p=supertux.git

fixed solid water for tux
fixed hurt sound

SVN-Revision: 2767
---

diff --git a/data/sounds/hurt.wav b/data/sounds/hurt.wav
index 20537c36e..1efb76f45 100644
Binary files a/data/sounds/hurt.wav and b/data/sounds/hurt.wav differ
diff --git a/src/object/player.cpp b/src/object/player.cpp
index 13121b511..9b370c5a7 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -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?