From: Mario <mario@smbclan.net>
Date: Wed, 14 Dec 2016 13:00:03 +0000 (+1000)
Subject: Use new item name in Quake compat, may fix weird issues with mega armor on old maps
X-Git-Tag: xonotic-v0.8.2~378
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=acbd1119c69da83e7fd70b2a79113749d8a6f92b;ds=inline

Use new item name in Quake compat, may fix weird issues with mega armor on old maps
---

diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc
index dac8f19300..7a277df98b 100644
--- a/qcsrc/server/t_quake.qc
+++ b/qcsrc/server/t_quake.qc
@@ -6,8 +6,7 @@ spawnfunc(weapon_electro);
 spawnfunc(weapon_hagar);
 spawnfunc(weapon_machinegun);
 spawnfunc(item_bullets);
-spawnfunc(item_armor_large);
-spawnfunc(item_armor_large);
+spawnfunc(item_armor_mega);
 spawnfunc(item_health_mega);
 spawnfunc(item_health_medium);
 
@@ -20,8 +19,8 @@ spawnfunc(weapon_supershotgun) {spawnfunc_weapon_machinegun(this);}
 
 spawnfunc(item_spikes) {spawnfunc_item_bullets(this);}
 //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_armor2) {spawnfunc_item_armor_large(this);}
-spawnfunc(item_armorInv) {spawnfunc_item_armor_large(this);} // TODO: make sure we actually want this
+spawnfunc(item_armor2) {spawnfunc_item_armor_mega(this);}
+spawnfunc(item_armorInv) {spawnfunc_item_armor_mega(this);} // TODO: make sure we actually want this
 spawnfunc(item_health) {if (this.spawnflags & 2) spawnfunc_item_health_mega(this);else spawnfunc_item_health_medium(this);}
 
 //spawnfunc_item_spikes
diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 254130f88c..85ec325bdf 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -18,7 +18,7 @@ spawnfunc(item_shells);
 spawnfunc(item_jetpack);
 
 spawnfunc(item_armor_big);
-spawnfunc(item_armor_large);
+spawnfunc(item_armor_mega);
 spawnfunc(item_armor_small);
 
 spawnfunc(item_health_medium);
@@ -59,7 +59,7 @@ spawnfunc(ammo_bfg)            { spawnfunc_item_cells(this);          }
 spawnfunc(ammo_rockets)        { spawnfunc_item_rockets(this);        }
 
 // Armor
-spawnfunc(item_armor_body)     { spawnfunc_item_armor_large(this);    }
+spawnfunc(item_armor_body)     { spawnfunc_item_armor_mega(this);    }
 spawnfunc(item_armor_combat)   { spawnfunc_item_armor_big(this);      }
 spawnfunc(item_armor_shard)    { spawnfunc_item_armor_small(this);    }
 spawnfunc(item_enviro)         { spawnfunc_item_invincible(this);     }