changeteam & akimbo fixes (thx grenadier)

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4608 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2009-08-08 13:06:16 +00:00
parent 51dfacd66b
commit 71e190c98c
3 changed files with 5 additions and 3 deletions
@@ -1226,7 +1226,7 @@ void checkakimbo()
    if(player1->akimbo)
    {
        akimbo &a = *((akimbo *)player1->weapons[GUN_AKIMBO]);
-        if(a.timerout())
+        if(a.timerout() || player1->state == CS_DEAD)
        {
            weapon &p = *player1->weapons[GUN_PISTOL];
            player1->akimbo = false;
@@ -1238,7 +1238,7 @@ void checkakimbo()
 			a.mag = 0;
 			a.ammo = 0;
            if(player1->weaponsel->type==GUN_AKIMBO) player1->weaponswitch(&p);
-	        audiomgr.playsoundc(S_AKIMBOOUT);
+	        if(player1->state != CS_DEAD) audiomgr.playsoundc(S_AKIMBOOUT);
        }
    }
 }