From 4d5958d6a729a6d13b72ce316d24a780d7433830 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 11 Dec 2010 00:42:30 +0100 Subject: [PATCH] fix start ammo in weaponarena --- qcsrc/server/miscfunctions.qc | 27 +++++++++++++++++---------- qcsrc/server/w_seeker.qc | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 8e052e837..11c97cc11 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -981,16 +981,23 @@ void readplayerstartcvars() if (g_weaponarena) { start_weapons = g_weaponarena; - if (g_weaponarena & (WEPBIT_GRENADE_LAUNCHER | WEPBIT_MINE_LAYER | WEPBIT_HAGAR | WEPBIT_ROCKET_LAUNCHER)) - start_ammo_rockets = 999; - if (g_weaponarena & WEPBIT_SHOTGUN) - start_ammo_shells = 999; - if (g_weaponarena & (WEPBIT_ELECTRO | WEPBIT_CRYLINK | WEPBIT_NEX | WEPBIT_MINSTANEX | WEPBIT_HLAC | WEPBIT_HOOK)) - start_ammo_cells = 999; - if (g_weaponarena & (WEPBIT_UZI | WEPBIT_CAMPINGRIFLE)) - start_ammo_nails = 999; - if (g_weaponarena & WEPBIT_HOOK) - start_ammo_fuel = 999; + for (j = WEP_FIRST; j <= WEP_LAST; ++j) + { + e = get_weaponinfo(j); + if(start_weapons & e.weapons) + { + if(e.items & IT_ROCKETS) + start_ammo_rockets = 999; + if(e.items & IT_SHELLS) + start_ammo_shells = 999; + if(e.items & IT_CELLS) + start_ammo_cells = 999; + if(e.items & IT_NAILS) + start_ammo_nails = 999; + if(e.items & IT_FUEL) + start_ammo_fuel = 999; + } + } start_items |= IT_UNLIMITED_AMMO; } else if (g_minstagib) diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index 4ab7f4f22..eb64dddd8 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -158,7 +158,7 @@ void Seeker_Fire_Missile(vector f_diff) { local entity missile; - if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO) + if not(self.items & IT_UNLIMITED_WEAPON_AMMO) self.ammo_rockets = self.ammo_rockets - autocvar_g_balance_seeker_missile_ammo; makevectors(self.v_angle); -- 2.39.2