Implement g_fire_reloads_ubgl cvar, add missing FireEnd to fire h…

…andler

src/xrGame/WeaponMagazinedWGrenade.cpp

@@ -18,6 +18,8 @@
 #	include "phdebug.h"
 #endif
 
+BOOL g_fire_reloads_ubgl = TRUE;
+
 CWeaponMagazinedWGrenade::CWeaponMagazinedWGrenade(ESoundTypes eSoundType) : CWeaponMagazined(eSoundType)
 {
 	m_ammoType2 = 0;
@@ -313,12 +315,15 @@ bool CWeaponMagazinedWGrenade::Action(u16 cmd, u32 flags)
 					LaunchGrenade();
 				else
 					FireStart();
-			else
+			else if(g_fire_reloads_ubgl)
 				Reload();
 
 			if (GetState() == eIdle)
 				OnEmptyClick();
 		}
+		else
+			FireEnd();
+
 		return true;
 	}
 
@@ -499,16 +504,6 @@ void CWeaponMagazinedWGrenade::LaunchGrenade()
 	}
 }
 
-void CWeaponMagazinedWGrenade::FireEnd()
-{
-	if (m_bGrenadeMode)
-	{
-		CWeapon::FireEnd();
-	}
-	else
-		inherited::FireEnd();
-}
-
 void CWeaponMagazinedWGrenade::OnMagazineEmpty()
 {
 	if (GetState() == eIdle)

src/xrGame/WeaponMagazinedWGrenade.h

@@ -39,7 +39,6 @@ class CWeaponMagazinedWGrenade : public CWeaponMagazined,
 	virtual bool UseScopeTexture();
 	virtual float CurrentZoomFactor();
 	virtual u8 GetCurrentHudOffsetIdx();
-	virtual void FireEnd();
 	void LaunchGrenade();
 
 	virtual void OnStateSwitch(u32 S, u32 oldState);

src/xrGame/console_commands.cpp

@@ -234,6 +234,8 @@ extern float wallmark_range_skeleton;
 
 ENGINE_API extern float g_console_sensitive;
 
+extern BOOL g_fire_reloads_ubgl;
+
 u32 g_dead_body_collision = 1;
 
 xr_token dead_body_collision_tokens[] =
@@ -2577,6 +2579,8 @@ void CCC_RegisterCommands()
 	CMD4(CCC_Integer, "g_nearwall", &g_nearwall, 0, 2);
 	CMD4(CCC_Integer, "g_nearwall_trace", &g_nearwall_trace, 0, 1);
 
+	CMD4(CCC_Integer, "g_fire_reloads_ubgl", &g_fire_reloads_ubgl, 0, 1);
+
 	CMD3(CCC_Mask, "g_crosshair_show_always", &psCrosshair_Flags, CROSSHAIR_SHOW_ALWAYS);
 	CMD3(CCC_Mask, "g_crosshair_independent", &psCrosshair_Flags, CROSSHAIR_INDEPENDENT);