X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ft_items.qc;h=a5786888c18169abdfb93a44200b9383feab5a8d;hp=4a3712a25b31a02aac9b1e8d429933fb0463ca33;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hpb=5359f9a584275a854c94011dcc77e67e79bd76d6

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 4a3712a25b..a5786888c1 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -356,8 +356,8 @@ bool ItemSend(entity this, entity to, int sf)
 	{
 		WriteShort(MSG_ENTITY, this.colormap);
 		WriteByte(MSG_ENTITY, this.glowmod.x * 255.0);
-        WriteByte(MSG_ENTITY, this.glowmod.y * 255.0);
-        WriteByte(MSG_ENTITY, this.glowmod.z * 255.0);
+		WriteByte(MSG_ENTITY, this.glowmod.y * 255.0);
+		WriteByte(MSG_ENTITY, this.glowmod.z * 255.0);
 	}
 
 	if(sf & ISF_DROP)
@@ -402,7 +402,7 @@ bool have_pickup_item(entity this)
 	return true;
 }
 
-void Item_Show (entity e, int mode)
+void Item_Show(entity e, int mode)
 {
 	e.effects &= ~(EF_ADDITIVE | EF_STARDUST | EF_FULLBRIGHT | EF_NODEPTHTEST);
 	e.ItemStatus &= ~ITS_STAYWEP;
@@ -479,13 +479,13 @@ float Item_ItemsTime_UpdateTime(entity e, float t);
 void Item_ItemsTime_SetTime(entity e, float t);
 void Item_ItemsTime_SetTimesForAllPlayers();
 
-void Item_Respawn (entity this)
+void Item_Respawn(entity this)
 {
 	Item_Show(this, 1);
 	sound(this, CH_TRIGGER, this.itemdef.m_respawnsound, VOL_BASE, ATTEN_NORM);	// play respawn sound
 	setorigin(this, this.origin);
 
-    if (Item_ItemsTime_Allow(this.itemdef) || (STAT(WEAPONS, this) & WEPSET_SUPERWEAPONS))
+	if (Item_ItemsTime_Allow(this.itemdef) || (STAT(WEAPONS, this) & WEPSET_SUPERWEAPONS))
 	{
 		float t = Item_ItemsTime_UpdateTime(this, 0);
 		Item_ItemsTime_SetTime(this, t);
@@ -499,7 +499,7 @@ void Item_Respawn (entity this)
 	Send_Effect(EFFECT_ITEM_RESPAWN, CENTER_OR_VIEWOFS(this), '0 0 0', 1);
 }
 
-void Item_RespawnCountdown (entity this)
+void Item_RespawnCountdown(entity this)
 {
 	if(this.item_respawncounter >= ITEM_RESPAWN_TICKS)
 	{
@@ -624,7 +624,7 @@ float adjust_respawntime(float normal_respawntime) {
 		}
 	}
 	TeamBalance_Destroy(balance);
-	
+
 	if (players >= 2) {
 		return normal_respawntime * (r / (players + o) + l);
 	} else {
@@ -1008,8 +1008,8 @@ void Item_FindTeam(entity this)
 		});
 
 		e = RandomSelection_chosen_ent;
-		e.state = 0;
-		Item_Show(e, 1);
+		if (!e)
+			return;
 
 		IL_EACH(g_items, it.team == this.team,
 		{
@@ -1021,11 +1021,11 @@ void Item_FindTeam(entity this)
 					Item_Show(it, -1);
 					it.state = 1; // state 1 = initially hidden item, apparently
 				}
+				else
+					Item_Reset(it);
 				it.effects &= ~EF_NODRAW;
 			}
 		});
-
-		Item_Reset(this);
 	}
 }
 
@@ -1172,7 +1172,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
 {
 	string itemname = def.m_name;
 	Model itemmodel = def.m_model;
-    Sound pickupsound = def.m_sound;
+	Sound pickupsound = def.m_sound;
 	float(entity player, entity item) pickupevalfunc = def.m_pickupevalfunc;
 	float pickupbasevalue = def.m_botvalue;
 	int itemflags = def.m_itemflags;
@@ -1180,10 +1180,10 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
 	startitem_failed = false;
 
 	this.item_model_ent = itemmodel;
-    this.item_pickupsound_ent = pickupsound;
+	this.item_pickupsound_ent = pickupsound;
 
-    if(def.m_iteminit)
-    	def.m_iteminit(def, this);
+	if(def.m_iteminit)
+		def.m_iteminit(def, this);
 
 	if(!this.respawntime) // both need to be set
 	{
@@ -1317,7 +1317,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
 			|| (def.instanceOfHealth && def != ITEM_HealthSmall)
 			|| (def.instanceOfArmor && def != ITEM_ArmorSmall)
 			|| (itemid & (IT_KEY1 | IT_KEY2))
-		) 
+		)
 		{
 			if(!this.target || this.target == "")
 				this.target = "###item###"; // for finding the nearest item using findnearest
@@ -1360,7 +1360,7 @@ void _StartItem(entity this, entity def, float defaultrespawntime, float default
 	}
 
 	this.state = 0;
-	if(this.team) // broken, no idea why.
+	if(this.team)
 	{
 		if(!this.cnt)
 			this.cnt = 1; // item probability weight
@@ -1584,8 +1584,8 @@ spawnfunc(target_items)
 	for(int j = 0; j < n; ++j)
 	{
 		FOREACH(Weapons, it != WEP_Null && W_UndeprecateName(argv(j)) == it.netname, {
-            it.wr_init(it);
-            break;
+			it.wr_init(it);
+			break;
 		});
 	}
 }