From bc70cfa46fb87929c97adffb9e2be8d4b897c921 Mon Sep 17 00:00:00 2001 From: driAn Date: Thu, 15 May 2008 20:50:09 +0000 Subject: [PATCH] grenade floating in water git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1985 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/physics.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index ef813bbf..60d7c3b8 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -464,7 +464,11 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime) } // play sounds on water transitions - if(!pl->inwater && water) { playsound(S_SPLASH2, NULL, NULL, &pl->o); pl->vel.z = 0; } + if(!pl->inwater && water) + { + playsound(S_SPLASH2, NULL, NULL, &pl->o); + if(pl==player1) pl->vel.z = 0; + } else if(pl->inwater && !water) playsound(S_SPLASH1, NULL, NULL, &pl->o); pl->inwater = water; // Added by Rick: Easy hack to store previous locations of all players/monsters/bots