kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bounce sound for grenades

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2072 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-20 20:43:29 +00:00
parent cfc2d63970
commit 445e691331
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+5 -1
View File
@@ -385,6 +385,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
}
}
bool collided = false;
if(!editfly) loopi(moveres) // discrete steps collision detection & sliding
{
const float f = 1.0f/moveres;
@@ -394,7 +395,8 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
pl->o.y += f*d.y;
pl->o.z += f*d.z;
hitplayer = NULL;
if(collide(pl, false, drop, rise)) continue;
if(collide(pl, false, drop, rise)) continue;
else collided = true;
if(pl->type==ENT_CAMERA) return;
if(pl->type==ENT_PLAYER && hitplayer)
{
@@ -438,6 +440,8 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
break;
}
if(collided) pl->oncollision();
if(pl->type==ENT_CAMERA) return;
else if(pl->type!=ENT_BOUNCE)
{