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

crouch footsteps

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1558 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-01-04 14:33:54 +00:00
parent dfe3790138
commit 51ccb6bc25
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/sound.cpp
+14 -9
View File
@@ -276,11 +276,11 @@ int findsoundloc(int sound, physent *p)
void checkplayerloopsounds()
{
if(findsoundloc(S_FOOTSTEPS, player1) == -1)
{
conoutf("play %d", lastmillis);
playsound(S_FOOTSTEPS, player1);
}
int fsl = findsoundloc(S_FOOTSTEPS, player1);
int csl = findsoundloc(S_FOOTSTEPSCROUCH, player1);
if(fsl == -1) playsound(S_FOOTSTEPS, player1);
if(csl == -1 || (!soundlocs[csl].inuse && player1->crouching)) playsound(S_FOOTSTEPSCROUCH, player1);
loopv(players)
{
playerent *p = players[i];
@@ -337,16 +337,21 @@ void updatechanvol(int chan, int svol, soundloc *sl)
}
if(sl->pse) // control looping physent sound volume
{
if(sl->slot == &gamesounds[S_FOOTSTEPS]) // control footsteps
if(sl->pse->type == ENT_PLAYER || sl->pse->type == ENT_BOT)
{
if(sl->pse->type == ENT_PLAYER || sl->pse->type == ENT_BOT)
if(sl->slot == &gamesounds[S_FOOTSTEPS]) // control footsteps
{
playerent *p = (playerent *)sl->pse;
ASSERT(p);
bool nofootsteps = !footsteps || p->state != CS_ALIVE || lastmillis-p->lastpain < 300 || (!p->onfloor && p->timeinair>50) || (!p->move && !p->strafe);
bool nofootsteps = !footsteps || p->state != CS_ALIVE || lastmillis-p->lastpain < 300 || (!p->onfloor && p->timeinair>50) || (!p->move && !p->strafe) || p->crouching;
if(nofootsteps) vol = 0; // fade out instead?
else if(p==player1) vol = vol*3/5; // dampen local footsteps
}
else if(sl->slot == &gamesounds[S_FOOTSTEPSCROUCH]) // control crouching
{
playerent *p = (playerent *)sl->pse;
if(!p->crouching) vol = 0;
else if(p==player1) vol = vol*3/5;
}
}
}
if(stereo && (v.x != 0 || v.y != 0) && dist>0)