From c5a057485370a660d9f7d9b2396c7c288808e930 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Tue, 14 Jul 2020 21:17:43 +1000 Subject: [PATCH] Spawn medium (25) armor for item_armor1 when map format != Q3BSP --- qcsrc/server/compat/quake.qc | 12 +++++++----- qcsrc/server/items.qc | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/compat/quake.qc b/qcsrc/server/compat/quake.qc index 93d935e02..e8f1fdea2 100644 --- a/qcsrc/server/compat/quake.qc +++ b/qcsrc/server/compat/quake.qc @@ -4,15 +4,17 @@ #include #include -//*********************** -//QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons -//*********************** -// see: quake3.qc for weapon_nailgun +/*********************** + * QUAKE 1 ENTITIES - So people can play quake1 maps with the xonotic weapons + *********************** + weapon_nailgun handled in quake3.qc + item_armor1 handled in items.qc +*/ + SPAWNFUNC_WEAPON(weapon_supernailgun, WEP_HAGAR) SPAWNFUNC_WEAPON(weapon_supershotgun, WEP_MACHINEGUN) SPAWNFUNC_ITEM(item_spikes, ITEM_Bullets) -//spawnfunc(item_armor1) {spawnfunc_item_armor_medium(this);} // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard SPAWNFUNC_ITEM(item_armor2, ITEM_ArmorMega) SPAWNFUNC_ITEM(item_armorInv, ITEM_ArmorMega) // TODO: make sure we actually want this SPAWNFUNC_ITEM_COND(item_health, (this.spawnflags & 2), ITEM_HealthMega, ITEM_HealthMedium) diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc index ab53a10fc..9814db93b 100644 --- a/qcsrc/server/items.qc +++ b/qcsrc/server/items.qc @@ -130,8 +130,7 @@ void Item_SetExpiring(entity item, bool expiring) // Compatibility spawn functions -// FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard -SPAWNFUNC_ITEM(item_armor1, ITEM_ArmorSmall) +SPAWNFUNC_ITEM_COND(item_armor1, cvar_string("sv_mapformat_is_quake3"), ITEM_ArmorSmall, ITEM_ArmorMedium) SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega) -- 2.39.2