items: clean up weapon/ammo .count field q3compat code

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 9565c5b7e70cc6aca06eb1dc90883693eeeab25d..ef933193453001415c4a7b7ac76de488f2c88ef5 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -448,18 +448,18 @@ bool DoesQ3ARemoveThisEntity(entity this)
        return false;
 }
 
-int GetAmmoConsumptionQ3(string netname)
-// Returns ammo consumed per shot by the primary/default fire mode
-// Returns 0 if the netname has no ammo cvar
+/// Returns ammo consumed per shot by the primary/default fire mode.
+/// Return value is undefined if entity isn't a weapon that uses ammo.
+int GetAmmoConsumptionQ3(entity wpn)
 {
-       switch (netname)
+       switch (wpn)
        {
-               case "arc":        return autocvar_g_balance_arc_beam_ammo;
-               case "devastator": return autocvar_g_balance_devastator_ammo;
-               case "machinegun": return autocvar_g_balance_machinegun_sustained_ammo;
-               case "minelayer":  return autocvar_g_balance_minelayer_ammo;
-               case "seeker":     return autocvar_g_balance_seeker_tag_ammo;
-               default:           return cvar(strcat("g_balance_", netname, "_primary_ammo"));
+               case WEP_ARC:        return WEP_CVAR(WEP_ARC,        beam_ammo);
+               case WEP_DEVASTATOR: return WEP_CVAR(WEP_DEVASTATOR, ammo);
+               case WEP_MACHINEGUN: return WEP_CVAR(WEP_MACHINEGUN, sustained_ammo);
+               case WEP_MINE_LAYER: return WEP_CVAR(WEP_MINE_LAYER, ammo);
+               case WEP_SEEKER:     return WEP_CVAR(WEP_SEEKER,     tag_ammo);
+               default:             return WEP_CVAR_PRI(wpn, ammo);
        }
 }
 

diff --git a/qcsrc/server/compat/quake3.qh b/qcsrc/server/compat/quake3.qh
index 1253c92a93b4887d525152d86ffc7b33e6b2ae2e..752ccd6614ac8dbedb0653c0c499ddc991cea909 100644 (file)
--- a/qcsrc/server/compat/quake3.qh
+++ b/qcsrc/server/compat/quake3.qh
@@ -7,7 +7,7 @@ int q3compat = 0;
 bool autocvar_sv_q3compat_changehitbox;
 
 bool DoesQ3ARemoveThisEntity(entity this);
-int GetAmmoConsumptionQ3(string netname);
+int GetAmmoConsumptionQ3(entity wpn);
 
 .int fragsfilter_cnt;
 
@@ -19,8 +19,8 @@ int GetAmmoConsumptionQ3(string netname);
 #define SPAWNFUNC_Q3AMMO(ammo_classname, xonwep) \
        spawnfunc(ammo_classname) \
        { \
-               if(this.count && xonwep.ammo_type) \
-                       SetResource(this, xonwep.ammo_type, this.count * GetAmmoConsumptionQ3(xonwep.netname)); \
+               if(this.count && xonwep.ammo_type != RES_NONE) \
+                       SetResource(this, xonwep.ammo_type, this.count * GetAmmoConsumptionQ3(xonwep)); \
                SPAWNFUNC_BODY(GetAmmoItem(xonwep.ammo_type)) \
        }
 

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 4a669e49921fee4c4a3c09f038a18f50d41c6fde..3a20ec80eeea031044035ce66ce583ad18d0e049 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -113,7 +113,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
        {
                int ammo = 0;
                if (q3compat && this.count > 0)
-                       ammo = this.count * GetAmmoConsumptionQ3(wpn.netname);
+                       ammo = this.count * GetAmmoConsumptionQ3(wpn);
                        // WEAPONTODO: magazines of MG, rifle and OK weapons are unaccounted for
                else
                {