From 657f9cd353491c03a64e4c2eeaabb0d4771716e4 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 5 Mar 2012 13:49:56 +0100 Subject: [PATCH] more fixing :P --- qcsrc/server/miscfunctions.qc | 4 ++-- qcsrc/server/t_items.qc | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 0b17144ea..051b47600 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1040,8 +1040,8 @@ void readplayerstartcvars() for (i = WEP_FIRST; i <= WEP_LAST; ++i) { e = get_weaponinfo(i); - if(WEPSET_CONTAINS_AW(start_weapons, j) || WEPSET_CONTAINS_AW(warmup_start_weapons, j)) - weapon_action(e.weapon, WR_PRECACHE); + if(WEPSET_CONTAINS_AW(start_weapons, i) || WEPSET_CONTAINS_AW(warmup_start_weapons, i)) + weapon_action(i, WR_PRECACHE); } start_ammo_shells = max(0, start_ammo_shells); diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 48a8fec84..a586ecbaf 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -748,6 +748,11 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } + if(self.model != "") + itemmodel = self.model; + if(self.item_pickupsound != "") + pickupsound = self.item_pickupsound; + // is it a dropped weapon? if (self.classname == "droppedweapon") { @@ -794,11 +799,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, return; } - if(self.model != "") - itemmodel = self.model; - if(self.item_pickupsound != "") - pickupsound = self.item_pickupsound; - self.reset = Item_Reset; // it's a level item if(self.spawnflags & 1) @@ -1099,8 +1099,7 @@ void weapon_defaultspawnfunc(float wpn) if(self.team) f |= FL_NO_WEAPON_STAY; - self.item_pickupsound = "weapons/weaponpickup.wav"; - StartItem(e.model, self.item_pickupsound, self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue); + StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapon, f, weapon_pickupevalfunc, e.bot_pickupbasevalue); if (self.modelindex) // don't precache if self was removed weapon_action(e.weapon, WR_PRECACHE); } -- 2.39.2