X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=79c39ae95d7998899e99529451df30ff22b05fed;hb=1f1c714c231334ca941e029e7ab2094fff25b476;hp=a43be3ff7dd63ee4d7b4a6e8fa66c1fb5da7d1df;hpb=8f0281c70368ec92197867d6181e5e955b5fd6c1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index a43be3ff7..79c39ae95 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -5,7 +5,7 @@ float have_pickup_item(void)
 		if(self.classname != "minstagib")
 			return FALSE;
 
-	if(self.items == IT_STRENGTH || self.items == IT_INVINCIBLE)
+	if(self.flags & FL_POWERUP)
 	{
 		if(autocvar_g_powerups > 0)
 			return TRUE;
@@ -233,6 +233,11 @@ void Item_RespawnCountdown (void)
 				case IT_FUEL_REGEN:     name = "item-fuelregen"; rgb = '1 0.5 0'; break;
 				case IT_JETPACK:        name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break;
 			}
+			if(!name)
+			{
+				print("Unknown powerup-marked item is wanting to respawn\n");
+				localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self)));
+			}
 			if(name)
 			{
 				WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE, RADARICON_POWERUP, rgb);
@@ -695,6 +700,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 
 	self.items = itemid;
 	self.weapons = weaponid;
+	self.flags = FL_ITEM | itemflags;
 
 	// is it a dropped weapon?
 	if (self.classname == "droppedweapon")
@@ -811,7 +817,6 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		self.respawntimejitter = defaultrespawntimejitter;
 	}
 	self.netname = itemname;
-	self.flags = FL_ITEM | itemflags;
 	self.touch = Item_Touch;
 	setmodel (self, self.mdl); // precision set below
 	self.effects |= EF_LOWPRECISION;