Merge branch 'terencehill/menu_weaponarena_selection_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / items / item / powerup.qc

diff --git a/qcsrc/common/items/item/powerup.qc b/qcsrc/common/items/item/powerup.qc
index 0f025aed8f5a4ab4ee0282f24343e05077922f3e..fcfe2afb93a5a7c4b44183dfd6c654595f9c1c77 100644 (file)
--- a/qcsrc/common/items/item/powerup.qc
+++ b/qcsrc/common/items/item/powerup.qc
@@ -1,19 +1,26 @@
 #include "powerup.qh"
 #include "../../../server/t_items.qh"
 
-REGISTER_ITEM(Strength, Powerup) {
-    this.m_model    =   "models/items/g_strength.md3";
-    this.m_sound    =   "misc/powerup.wav";
-    this.m_name     =   "Strength Powerup";
-#ifdef SVQC
-    this.m_itemid   =   IT_STRENGTH;
+#ifndef SVQC
+.int m_itemid;
 #endif
+REGISTER_ITEM(Strength, Powerup) {
+    this.m_model            =   "g_strength.md3";
+    this.m_sound            =   "misc/powerup.wav";
+    this.m_name             =   "Strength Powerup";
+    this.m_icon             =   "strength";
+    this.m_color            =   '0 0 1';
+    this.m_waypoint         =   _("Strength");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_STRENGTH;
 }
 REGISTER_ITEM(Shield, Powerup) {
-    this.m_model    =   "models/items/g_invincible.md3";
-    this.m_sound    =   "misc/powerup_shield.wav";
-    this.m_name     =   "Shield";
-#ifdef SVQC
-    this.m_itemid   =   IT_INVINCIBLE;
-#endif
+    this.m_model            =   "g_invincible.md3";
+    this.m_sound            =   "misc/powerup_shield.wav";
+    this.m_name             =   "Shield";
+    this.m_icon             =   "shield";
+    this.m_color            =   '1 0 1';
+    this.m_waypoint         =   _("Shield");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_INVINCIBLE;
 }