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

bug fix: head shot sound played in any sniper gibs

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4991 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Rafael Barreto
2010-05-21 20:42:32 +00:00
parent 97dd147aa7
commit bbd017766e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+3 -3
View File
@@ -639,12 +639,12 @@ void dodamage(int damage, playerent *pl, playerent *actor, bool gib, bool local)
}
damageeffect(damage, pl);
if(pl->health<=0) { if(local) dokill(pl, actor, gib); }
if(pl->health<=0) { if(local) dokill(pl, actor, gib, pl->weaponsel->type); }
else if(pl==player1) audiomgr.playsound(S_PAIN6, SP_HIGH);
else audiomgr.playsound(S_PAIN1+rnd(5), pl);
}
void dokill(playerent *pl, playerent *act, bool gib)
void dokill(playerent *pl, playerent *act, bool gib, int gun)
{
if(pl->state!=CS_ALIVE || intermission) return;
@@ -669,7 +669,7 @@ void dokill(playerent *pl, playerent *act, bool gib)
if(gib)
{
if(pl!=act && act->weaponsel->type == GUN_SNIPER) audiomgr.playsound(S_HEADSHOT, SP_LOW);
if(pl!=act && /*act->weaponsel->type*/ gun == GUN_SNIPER) audiomgr.playsound(S_HEADSHOT, SP_LOW);
addgib(pl);
}