toggle onemanarmy flare

main/pvbrust.cfg

@@ -593,6 +593,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

main/pvbvote.cfg

@@ -593,6 +593,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

main/server.cfg

@@ -591,6 +591,7 @@ set scr_deleteNadeOnTeamChange "1"
 // _perkfunctions
 set combathighIsJuiced "1"
 set onemanarmyRefillsTubes "1"
+set fix_onemanarmyFlareBug "0"
 
 // _killstreaks
 set scr_killstreak_rollover "1"

userraw/maps/mp/perks/_perkfunctions.gsc

@@ -629,8 +629,12 @@ selectOneManArmyClass()
 	level endon ( "game_ended" );
 	
 	self _disableWeaponSwitch();
+
+	if (level.fix_onemanarmyFlareBug)
+	{
 		self _disableOffhandWeapons();
 		self _disableUsability();
+	}
 	
 	self openPopupMenu( game["menu_onemanarmy"] );
 	
@@ -639,23 +643,35 @@ selectOneManArmyClass()
 	self waittill ( "menuresponse", menu, className );
 
 	self _enableWeaponSwitch();
+	
+	if (level.fix_onemanarmyFlareBug)
+	{
 		self _enableOffhandWeapons();
 		self _enableUsability();
+	}
 	
 	if ( className == "back" || !isOneManArmyMenu( menu ) || self isUsingRemote() )
 	{
 		if ( self getCurrentWeapon() == "onemanarmy_mp" )
 		{
 			self _disableWeaponSwitch();
+
+			if (level.fix_onemanarmyFlareBug)
+			{
 					self _disableOffhandWeapons();
 					self _disableUsability();
+			}
 
 			self switchToWeapon( self getLastWeapon() );
 			self waittill ( "weapon_change" );
 			self _enableWeaponSwitch();
+
+			if (level.fix_onemanarmyFlareBug)
+			{
 					self _enableOffhandWeapons();
 					self _enableUsability();
 			}
+		}
 		return;
 	}	
 	

userraw/maps/mp/perks/_perks.gsc

@@ -12,6 +12,9 @@
 		- onemanarmyRefillsTubes <bool>
 			false - (default) One Man Army does not refill the gl attachment
 			true - it does
+
+		- fix_onemanarmyFlareBug <bool>
+			true - (default) fixes it
 */
 
 #include common_scripts\utility;
@@ -200,6 +203,9 @@ init()
 	setDvarIfUninitialized( "onemanarmyRefillsTubes", false );
 	level.onemanarmyRefillsTubes = getDvarInt( "onemanarmyRefillsTubes" );
 
+	setDvarIfUninitialized( "fix_onemanarmyFlareBug", true );
+	level.fix_onemanarmyFlareBug = getDvarInt( "fix_onemanarmyFlareBug" );
+
 	initPerkDvars();
 
 	level thread onPlayerConnect();