]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
no, let's use the "model" key. Should be safe. PLEASE TEST: does throwing weapons...
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Dec 2010 17:49:03 +0000 (18:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Dec 2010 17:49:03 +0000 (18:49 +0100)
qcsrc/server/t_items.qc

index 2add9ba91a7e9a8b637f0f2a6b49816797a0da21..166aad589b801f94514ac74ecbd73a8fb434a30f 100644 (file)
@@ -843,8 +843,10 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
        self.bot_pickup = TRUE;
        self.bot_pickupevalfunc = pickupevalfunc;
        self.bot_pickupbasevalue = pickupbasevalue;
-       if(self.mdl == "")
+       if(self.model == "")
                self.mdl = itemmodel;
+       else
+               self.mdl = self.model;
        self.item_pickupsound = pickupsound;
        // let mappers override respawntime
        if(!self.respawntime) // both set