more fixing :P

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 0b17144ea7cbeafd43ef735b299991f67a00280b..051b476002e0563cedb3db7cdb9b78fc1e6755fd 100644 (file)
--- 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 48a8fec84d33e66fdc4ee473304d6f762e805f90..a586ecbaf2d8d11cb5ddc28650fc498d03f32bf9 100644 (file)
--- 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);
 }