X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fspawning.qc;h=6351c3031e65c05e99dd3ea3f38a0f1bd163491c;hp=64ee71457dd923324474f6b04770a32a32dab402;hb=f776404e7ce6fc5516c0ba191d4ed2eb62846140;hpb=547a4228c0f88d9b226efe1026ee6085309c0c89

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 64ee71457d..6351c3031e 100644
--- 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;
 
+	GameItem def = e.m_pickup;
 	_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
-		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);