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

no movement sounds in water

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1840 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-03 15:15:26 +00:00
parent baaa93bf5b
commit 7e7fe5a334
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/physics.cpp
+1 -1
View File
@@ -335,7 +335,7 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime)
pl->jumpnext = false;
pl->vel.z = 2.0f; //1.7f; // physics impulse upwards
if(water) { pl->vel.x /= 8; pl->vel.y /= 8; } // dampen velocity change even harder, gives correct water feel
if(local) playsoundc(S_JUMP);
if(local && !water) playsoundc(S_JUMP);
else if(pl->type==ENT_BOT) playsound(S_JUMP, pl); // Added by Rick
}
pl->timeinair = 0;
source/src/sound.cpp
+1 -1
View File
@@ -599,7 +599,7 @@ void updateplayerfootsteps(playerent *p, int sound)
if(loc) // check again, only pause sound if player isn't moving
{
bool playing = loc->playing();
if(!footsteps || p->state != CS_ALIVE || lastmillis-p->lastpain < 300 || (!p->onfloor && p->timeinair>50) || (!p->move && !p->strafe) || (sound==S_FOOTSTEPS && p->crouching) || (sound==S_FOOTSTEPSCROUCH && !p->crouching))
if(!footsteps || p->state != CS_ALIVE || lastmillis-p->lastpain < 300 || (!p->onfloor && p->timeinair>50) || (!p->move && !p->strafe) || (sound==S_FOOTSTEPS && p->crouching) || (sound==S_FOOTSTEPSCROUCH && !p->crouching) || p->inwater)
{
if(playing) loc->pause();
}