From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Tue, 14 Jul 2020 12:59:08 +0000 (+1000)
Subject: Use cvar() instead of cvar_string() for sv_mapformat_is_quake3 checks
X-Git-Tag: xonotic-v0.8.5~352^2~65
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3be830ea20bf9864331413fb55083c5d9a57efb6;p=xonotic%2Fxonotic-data.pk3dir.git

Use cvar() instead of cvar_string() for sv_mapformat_is_quake3 checks
---

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index 0243a9409..1fa15871a 100644
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -57,7 +57,7 @@ SPAWNFUNC_WEAPON(weapon_chaingun, WEP_HLAC)
 SPAWNFUNC_ITEM(ammo_belt, ITEM_Cells)
 
 // Team Arena Nailgun -> Crylink || Quake Nailgun -> Electro
-SPAWNFUNC_WEAPON_COND(weapon_nailgun, cvar_string("sv_mapformat_is_quake3"), WEP_CRYLINK, WEP_ELECTRO)
+SPAWNFUNC_WEAPON_COND(weapon_nailgun, cvar("sv_mapformat_is_quake3"), WEP_CRYLINK, WEP_ELECTRO)
 SPAWNFUNC_ITEM(ammo_nails, ITEM_Cells)
 
 // LG -> Electro
diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc
index 9814db93b..d8a7d808d 100644
--- a/qcsrc/server/items.qc
+++ b/qcsrc/server/items.qc
@@ -130,7 +130,7 @@ void Item_SetExpiring(entity item, bool expiring)
 
 // Compatibility spawn functions
 
-SPAWNFUNC_ITEM_COND(item_armor1, cvar_string("sv_mapformat_is_quake3"), ITEM_ArmorSmall, ITEM_ArmorMedium)
+SPAWNFUNC_ITEM_COND(item_armor1, cvar("sv_mapformat_is_quake3"), ITEM_ArmorSmall, ITEM_ArmorMedium)
 
 SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega)