From ccd1c5048b4ca697d08811b9cd418599ef981558 Mon Sep 17 00:00:00 2001 From: Lucas GAUTHERON Date: Wed, 27 Apr 2011 19:14:24 +0000 Subject: [PATCH] quicknadethrow : switch weapon even if player is attacking git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6377 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/weapon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index a6de9d35..23aff589 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -110,7 +110,7 @@ void quicknadethrow(bool on) if(player1->state != CS_ALIVE) return; if(on) { - if(player1->weapons[GUN_GRENADE]->mag > 0 && !player1->attacking) + if(player1->weapons[GUN_GRENADE]->mag > 0) { if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]); if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold) { player1->attacking = true; nadeattack = true; }