From d644d119694cf5be3691cec4afea487f455be7e0 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 11 Nov 2006 02:30:59 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@580 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/weapon.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index 3e250d33..78025948 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -49,7 +49,7 @@ void weaponswitch(int gun) void weapon(int gun) { if(m_nogun && gun!=G_MELEE && gun!=G_GRENADE) return; - if(player1->weaponchanging) return; + if(player1->state!=CS_ALIVE || player1->weaponchanging) return; setscope(false); if(NADE_IN_HAND || player1->reloading) return; @@ -68,7 +68,7 @@ void weapon(int gun) void shiftweapon(int i) { - if(player1->weaponchanging) return; + if(player1->state!=CS_ALIVE || player1->weaponchanging) return; int gun; switch(player1->gunselect) { @@ -114,7 +114,7 @@ COMMAND(altaction, ARG_1INT); void reload(playerent *d) { - if(!d || d->reloading || d->weaponchanging) return; + if(!d || d->state!=CS_ALIVE || d->reloading || d->weaponchanging) return; if(d == player1) setscope(false); bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0;