Items: use Model references instead of strings

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / spawning.qc

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 64ee71457dd923324474f6b04770a32a32dab402..6351c3031e65c05e99dd3ea3f38a0f1bd163491c 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -170,20 +170,17 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
        if (this.team)
                f |= FL_NO_WEAPON_STAY;
 
        if (this.team)
                f |= FL_NO_WEAPON_STAY;
 

+       GameItem def = e.m_pickup;

        _StartItem(
                this,
        _StartItem(
                this,

-               strzone(e.m_model.model_str()), // itemmodel
-               string_null, // pickupsound
+               this.itemdef = def,

                this.respawntime, // defaultrespawntime
                this.respawntimejitter, // defaultrespawntimejitter
                e.message, // itemname
                0, // itemid
                e.weapon, // weaponid
                this.respawntime, // defaultrespawntime
                this.respawntimejitter, // defaultrespawntimejitter
                e.message, // itemname
                0, // itemid
                e.weapon, // weaponid

-               f, // itemflags
-               weapon_pickupevalfunc, // pickupevalfunc
-               e.bot_pickupbasevalue // pickupbasevalue
+               f // itemflags

        );
        );

-       this.item_pickupsound_ent = SND_WEAPONPICKUP;

        #if 0 // WEAPONTODO
        if (this.modelindex) { // don't precache if this was removed
                e.wr_init(e);
        #if 0 // WEAPONTODO
        if (this.modelindex) { // don't precache if this was removed
                e.wr_init(e);