X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem.qh;h=350421465459bdd57312511b2cd935c565327a1d;hb=318c2deead2bdcdc9ff69d118f2ebc1ff0795c7a;hp=9e322c811d86354b1800e3e9dd79ab975382aa12;hpb=f61d242872ea00cd4eb0cd65b0ec1bef639ae4fe;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index 9e322c811..350421465 100644
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -69,27 +69,23 @@ const int ITS_GLOW              = BIT(6);
 .float invincible_finished; // ditto
 .float buffs_finished; // ditts
 
-#define spawnfunc_body(item) \
-	if (!Item_IsDefinitionAllowed(item)) \
+#define SPAWNFUNC_BODY(item) \
+	if (item && Item_IsDefinitionAllowed(item)) \
+		StartItem(this, item); \
+	else \
 	{ \
 		startitem_failed = true; \
 		delete(this); \
-		return; \
-	} \
-	StartItem(this, item)
+	}
 
 #define SPAWNFUNC_ITEM(name, item) \
 	spawnfunc(name) \
 	{ \
-		spawnfunc_body(item); \
+		SPAWNFUNC_BODY(item) \
 	}
 
 #define SPAWNFUNC_ITEM_COND(name, cond, item1, item2) \
-	spawnfunc(name) \
-	{ \
-		entity item = (cond) ? item1 : item2; \
-		spawnfunc_body(item); \
-	}
+	SPAWNFUNC_ITEM(name, (cond ? item1 : item2))
 
 #else