From 13ed2bd977c78756216bd471a7d9d587bb74d31c Mon Sep 17 00:00:00 2001 From: aurhat Date: Mon, 16 Mar 2015 21:16:42 +0100 Subject: [PATCH] Fix akimbo expiring Before, if player switched to akimbo just as it expired, he ended up with akimbo and 0 ammo. Now his weapon will change to default weapon (the most often primary), as if he would take akimbo in the hands. --- 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 3d3bc7cd..853bb6b3 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -1638,7 +1638,7 @@ void checkakimbo() // fix akimbo magcontent a.mag = 0; a.ammo = 0; - if(player1->weaponsel->type==GUN_AKIMBO) + if(player1->weaponsel->type==GUN_AKIMBO || (player1->weaponchanging && player1->nextweaponsel->type==GUN_AKIMBO)) { switch(akimboendaction)