From 762698f2d53ba397d2ce58cc6ebb1629b6003a24 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 5 Mar 2012 13:53:28 +0100 Subject: [PATCH] clean up some more messy code --- qcsrc/server/t_items.qc | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index a586ecbaf..8ab6f5210 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -735,8 +735,19 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, { startitem_failed = FALSE; + if(self.model == "") + self.model = itemmodel; + if(self.item_pickupsound == "") + self.item_pickupsound = pickupsound; + if(!self.respawntime) // both need to be set + { + self.respawntime = defaultrespawntime; + self.respawntimejitter = defaultrespawntimejitter; + } + self.items = itemid; self.weapon = weaponid; + if(weaponid) WEPSET_COPY_EW(self, weaponid); self.flags = FL_ITEM | itemflags; @@ -748,11 +759,6 @@ 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") { @@ -853,8 +859,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, WEPSET_OR_AW(weaponsInMap, weaponid); - precache_model (itemmodel); - precache_sound (pickupsound); + precache_model (self.model); + precache_sound (self.item_pickupsound); precache_sound ("misc/itemrespawncountdown.wav"); if(!g_minstagib && itemid == IT_STRENGTH) @@ -871,14 +877,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime, self.bot_pickup = TRUE; self.bot_pickupevalfunc = pickupevalfunc; self.bot_pickupbasevalue = pickupbasevalue; - self.mdl = itemmodel; - self.item_pickupsound = pickupsound; - // let mappers override respawntime - if(!self.respawntime) // both set - { - self.respawntime = defaultrespawntime; - self.respawntimejitter = defaultrespawntimejitter; - } + self.mdl = self.model; self.netname = itemname; self.touch = Item_Touch; setmodel (self, self.mdl); // precision set below -- 2.39.2