From 3728773ec0ee7a465ba7acfd8e4a335687f01a51 Mon Sep 17 00:00:00 2001 From: aurhat Date: Sun, 11 Jun 2017 13:55:07 +0200 Subject: [PATCH] Remove akimboautoswitch The problem is, that some players (especially SMG users) got on purpose akimbo with intention to not use it, only in order to others don't get it. Such behaviour is directed "piggishly" against other players and impoverish the game/gameplay. Now, if people don't want to use some akimbo, they should just to not get it, for example jump over it. DOCREF akimboautoswitch --- source/src/weapon.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index ae14dbcc..d24f74de 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -5,7 +5,6 @@ #include "hudgun.h" VARP(autoreload, 0, 1, 1); -VARP(akimboautoswitch, 0, 1, 1); VARP(akimboendaction, 0, 3, 3); // 0: switch to knife, 1: stay with pistol (if has ammo), 2: switch to grenade (if possible), 3: switch to primary (if has ammo) - all fallback to previous one w/o ammo for target struct sgray { @@ -1669,8 +1668,7 @@ void akimbo::onammopicked() akimbomillis = lastmillis + 30000; if(owner==player1) { - // if(owner->weaponsel->type!=GUN_SNIPER && owner->weaponsel->type!=GUN_GRENADE) owner->weaponswitch(this); - if(akimboautoswitch || owner->weaponsel->type==GUN_PISTOL) owner->weaponswitch(this); // Give the client full control over akimbo auto-switching // Bukz 2011apr23 + owner->weaponswitch(this); addmsg(SV_AKIMBO, "ri", lastmillis); } }