From: TimePath <andrew.hardaker1995@gmail.com>
Date: Fri, 14 Aug 2015 10:11:52 +0000 (+1000)
Subject: Remove redundant get_weaponinfo calls
X-Git-Tag: xonotic-v0.8.2~2062^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=046bea116835a7d137712f2f1d4e6fd62cce5769;p=xonotic%2Fxonotic-data.pk3dir.git

Remove redundant get_weaponinfo calls
---

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 1f1efd390..ec3e968b2 100644
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -101,7 +101,7 @@ int GetAmmoStat(.int ammotype);
 
 // other useful macros
 #define WEP_ACTION(wpn,wrequest) (get_weaponinfo(wpn)).weapon_func(wrequest)
-#define WEP_AMMO(wpn) ((get_weaponinfo(WEP_##wpn.m_id)).ammo_field) // only used inside weapon files/with direct name, don't duplicate prefix
+#define WEP_AMMO(wpn) (WEP_##wpn.ammo_field) // only used inside weapon files/with direct name, don't duplicate prefix
 #define WEP_NAME(wpn) ((get_weaponinfo(wpn)).message)
 
 
@@ -133,7 +133,7 @@ int GetAmmoStat(.int ammotype);
 
 // set initialization values for weapon settings
 #define WEP_SKIP_CVAR(unuseda,unusedb,unusedc,unusedd) /* skip cvars */
-#define WEP_SET_PROP(wepid,wepname,type,prop,name) get_weaponinfo(WEP_##wepid.m_id).##prop = autocvar_g_balance_##wepname##_##name;
+#define WEP_SET_PROP(wepid,wepname,type,prop,name) WEP_##wepid.prop = autocvar_g_balance_##wepname##_##name;
 
 
 // =====================
diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index 3659255ac..1c8e5883f 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -275,8 +275,8 @@ MUTATOR_HOOKFUNCTION(ok_StartItems)
 {
 	WepSet ok_start_items = (WEPSET_MACHINEGUN | WEPSET_VORTEX | WEPSET_SHOTGUN);
 
-	if((get_weaponinfo(WEP_RPC.m_id)).weaponstart > 0) { ok_start_items |= WEPSET_RPC; }
-	if((get_weaponinfo(WEP_HMG.m_id)).weaponstart > 0) { ok_start_items |= WEPSET_HMG; }
+	if(WEP_RPC.weaponstart > 0) { ok_start_items |= WEPSET_RPC; }
+	if(WEP_HMG.weaponstart > 0) { ok_start_items |= WEPSET_HMG; }
 
 	start_items |= IT_UNLIMITED_WEAPON_AMMO;
 	start_weapons = warmup_start_weapons = ok_start_items;
@@ -334,12 +334,12 @@ void ok_Initialize()
 	addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
 	addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);
 
-	(get_weaponinfo(WEP_RPC.m_id)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
-	(get_weaponinfo(WEP_HMG.m_id)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+	WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+	WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 
-	(get_weaponinfo(WEP_SHOTGUN.m_id)).mdl = "ok_shotgun";
-	(get_weaponinfo(WEP_MACHINEGUN.m_id)).mdl = "ok_mg";
-	(get_weaponinfo(WEP_VORTEX.m_id)).mdl = "ok_sniper";
+	WEP_SHOTGUN.mdl = "ok_shotgun";
+	WEP_MACHINEGUN.mdl = "ok_mg";
+	WEP_VORTEX.mdl = "ok_sniper";
 }
 
 MUTATOR_DEFINITION(mutator_overkill)
@@ -367,8 +367,8 @@ MUTATOR_DEFINITION(mutator_overkill)
 
 	MUTATOR_ONREMOVE
 	{
-		(get_weaponinfo(WEP_RPC.m_id)).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
-		(get_weaponinfo(WEP_HMG.m_id)).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
 	}
 
 	return false;