Merge branch 'master' into pending-release

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

diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index bc780da552677418eb14e3e5943d3e678085626d..561a5673a08011856e26d68cd28ecf8d9786add7 100644 (file)
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -10,6 +10,7 @@
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
 #include <server/weapons/spawning.qh>
+#include <server/world.qh>
 
 .bool m_isloot; ///< Holds whether item is loot.
 /// \brief Holds whether strength, shield or superweapon timers expire while
@@ -146,16 +147,10 @@ void Item_SetExpiring(entity item, bool expiring)
 // Compatibility spawn functions
 
 // in Quake this is green armor, in Xonotic maps it is an armor shard
-SPAWNFUNC_ITEM_COND(item_armor1, cvar("sv_mapformat_is_quake3"), ITEM_ArmorSmall, ITEM_ArmorMedium)
-
-SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega)
-
-SPAWNFUNC_ITEM(item_armor_large, ITEM_ArmorMega)
-
+SPAWNFUNC_ITEM_COND(item_armor1, autocvar_sv_mapformat_is_quake3, ITEM_ArmorSmall, ITEM_ArmorMedium)
+SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega) // Nexuiz used item_armor25 to spawn a Mega Armor
 SPAWNFUNC_ITEM(item_health1, ITEM_HealthSmall)
-
 SPAWNFUNC_ITEM(item_health25, ITEM_HealthMedium)
-
-SPAWNFUNC_ITEM(item_health_large, ITEM_HealthBig)
-
 SPAWNFUNC_ITEM(item_health100, ITEM_HealthMega)
+SPAWNFUNC_ITEM(item_armor_large, ITEM_ArmorMega)
+SPAWNFUNC_ITEM(item_health_large, ITEM_HealthBig)