From: Freddy <schro.sb@gmail.com>
Date: Sat, 10 Mar 2018 16:34:51 +0000 (+0100)
Subject: Remove legacy item_key1 and item_key2, use item_key instead
X-Git-Tag: xonotic-v0.8.5~120^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1989235281d65ad6fc59cf2fbe3129d8a4dab1d;p=xonotic%2Fxonotic-maps.pk3dir.git

Remove legacy item_key1 and item_key2, use item_key instead
---

diff --git a/scripts/entities.ent b/scripts/entities.ent
index 6b8c19ba..66a0f3b9 100644
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -697,32 +697,6 @@ This is the only correct way to put keys on the map!
 itemkeys MUST always have exactly one bit set.
 </point>
 
-<point name="item_key1" color="0 .5 .8" box="-16 -16 -24 16 16 32">
-SILVER key.
------------KEYS------------
-<color key="colormod" name="colormod">color of the key (default: '.9 .9 .9').</color>
-<string key="message" name="message">message to print when player picks up this key.</string>
-<model key="model" name="model">custom model to use.</model>
-<sound key="noise" name="noise">custom sound to play when player picks up the key.</sound>
--------- SPAWNFLAGS --------
-<flag key="FLOATING" name="FLOATING" bit="0">the item will float in air, instead of aligning to the floor by falling</flag>
----------NOTES----------
-Don't use this entity on new maps! Use item_key instead.
-</point>
-
-<point name="item_key2" color="0 .5 .8" box="-16 -16 -24 16 16 32">
-GOLD key.
------------KEYS------------
-<color key="colormod" name="colormod">color of the key (default: '1 .9 0').</color>
-<string key="message" name="message">message to print when player picks up this key.</string>
-<model key="model" name="model">custom model to use.</model>
-<sound key="noise" name="noise">custom sound to play when player picks up the key.</sound>
--------- SPAWNFLAGS --------
-<flag key="FLOATING" name="FLOATING" bit="0">the item will float in air, instead of aligning to the floor by falling</flag>
----------NOTES----------
-Don't use this entity on new maps! Use item_key instead.
-</point>
-
 <point name="item_minst_cells" color=".3 .3 1" box="-30 -30 0 30 30 32">
 Instagib ammo.
 Always contains 5 (g_instagib_ammo_drop) shots.