From: Freddy <schro.sb@gmail.com>
Date: Fri, 4 Nov 2016 17:11:48 +0000 (+0100)
Subject: Change item_armor_large to item_armor_mega
X-Git-Tag: xonotic-v0.8.2~387^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d7870030ea6e6266dd2917383727bc0a2dba48db;p=xonotic%2Fxonotic-data.pk3dir.git

Change item_armor_large to item_armor_mega

also add a spawnfunc for item_armor_large for
backwards compatability
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index dcd6bb982..dd521a7d9 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -1348,7 +1348,7 @@ spawnfunc(item_armor_big)
 	StartItem(this, ITEM_ArmorLarge);
 }
 
-spawnfunc(item_armor_large)
+spawnfunc(item_armor_mega)
 {
 	if(!this.armorvalue)
 		this.armorvalue = g_pickup_armormega;
@@ -1405,7 +1405,8 @@ spawnfunc(item_health_mega)
 
 // support old misnamed entities
 spawnfunc(item_armor1) { spawnfunc_item_armor_small(this); }  // FIXME: in Quake this is green armor, in Xonotic maps it is an armor shard
-spawnfunc(item_armor25) { spawnfunc_item_armor_large(this); }
+spawnfunc(item_armor25) { spawnfunc_item_armor_mega(this); }
+spawnfunc(item_armor_large) { spawnfunc_item_armor_mega(this); }
 spawnfunc(item_health1) { spawnfunc_item_health_small(this); }
 spawnfunc(item_health25) { spawnfunc_item_health_medium(this); }
 spawnfunc(item_health100) { spawnfunc_item_health_mega(this); }