X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fitems%2Fitem%2Farmor.qc;h=f8669e0e08503baa95529bef70f2424944ceb159;hb=6ba37d06b4afe2b08882f5cc5b211441227586b2;hp=e5ade4f4ba91574d4c729bc20d426c01f3f4be0a;hpb=c67e77ba36fb8dd44b39722e41943b6671b549ff;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/items/item/armor.qc b/qcsrc/common/items/item/armor.qc
index e5ade4f4b..f8669e0e0 100644
--- a/qcsrc/common/items/item/armor.qc
+++ b/qcsrc/common/items/item/armor.qc
@@ -1,12 +1,20 @@
 #include "armor.qh"
 #ifdef SVQC
-    #include "../../../server/t_items.qh"
+    #include <common/t_items.qh>
+#endif
+
+#ifndef MENUQC
+MODEL(ArmorSmall_ITEM, Item_Model("item_armor_small.md3"));
+SOUND(ArmorSmall, "misc/armor1");
 #endif
 
 REGISTER_ITEM(ArmorSmall, Armor) {
-    this.m_model                =   "models/items/item_armor_small.md3";
-    this.m_sound                =   "misc/armor1.wav";
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorSmall_ITEM;
+    this.m_sound                =   SND_ArmorSmall;
+#endif
     this.m_name                 =   "5 Armor";
+    this.m_icon                 =   "armor";
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_LOW;
     this.m_itemid               =   IT_ARMOR_SHARD;
@@ -15,10 +23,18 @@ REGISTER_ITEM(ArmorSmall, Armor) {
 #endif
 }
 
+#ifndef MENUQC
+MODEL(ArmorMedium_ITEM, Item_Model("item_armor_medium.md3"));
+SOUND(ArmorMedium, "misc/armor10");
+#endif
+
 REGISTER_ITEM(ArmorMedium, Armor) {
-    this.m_model                =   "models/items/item_armor_medium.md3";
-    this.m_sound                =   "misc/armor10.wav";
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorMedium_ITEM;
+    this.m_sound                =   SND_ArmorMedium;
+#endif
     this.m_name                 =   "25 Armor";
+    this.m_icon                 =   "armor";
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_MID;
     this.m_itemid               =   IT_ARMOR;
@@ -27,10 +43,20 @@ REGISTER_ITEM(ArmorMedium, Armor) {
 #endif
 }
 
+#ifndef MENUQC
+MODEL(ArmorLarge_ITEM, Item_Model("item_armor_big.md3"));
+SOUND(ArmorLarge, "misc/armor17_5");
+#endif
+
 REGISTER_ITEM(ArmorLarge, Armor) {
-    this.m_model                =   "models/items/item_armor_big.md3";
-    this.m_sound                =   "misc/armor17_5.wav";
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorLarge_ITEM;
+    this.m_sound                =   SND_ArmorLarge;
+#endif
     this.m_name                 =   "50 Armor";
+    this.m_icon                 =   "armor";
+    this.m_color                =   '0 1 0';
+    this.m_waypoint             =   _("Large armor");
 #ifdef SVQC
     this.m_botvalue             =   20000; // FIXME: higher than BOT_PICKUP_RATING_HIGH?
     this.m_itemid               =   IT_ARMOR;
@@ -39,10 +65,21 @@ REGISTER_ITEM(ArmorLarge, Armor) {
 #endif
 }
 
+#ifndef MENUQC
+MODEL(ArmorMega_ITEM, Item_Model("item_armor_large.md3"));
+SOUND(ArmorMega, "misc/armor25");
+#endif
+
 REGISTER_ITEM(ArmorMega, Armor) {
-    this.m_model                =   "models/items/item_armor_large.md3";
-    this.m_sound                =   "misc/armor25.wav";
+#ifndef MENUQC
+    this.m_model                =   MDL_ArmorMega_ITEM;
+    this.m_sound                =   SND_ArmorMega;
+#endif
     this.m_name                 =   "100 Armor";
+    this.m_icon                 =   "item_large_armor";
+    this.m_color                =   '0 1 0';
+    this.m_waypoint             =   _("Mega armor");
+    this.m_waypointblink        =   2;
 #ifdef SVQC
     this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
     this.m_itemid               =   IT_ARMOR;