From: Freddy <schro.sb@gmail.com>
Date: Thu, 10 Nov 2016 21:27:27 +0000 (+0100)
Subject: .m_glow is only needed in GAMEQC
X-Git-Tag: xonotic-v0.8.2~450^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=94210895fa2dc67ce2acd69ed6d09f81562b5439;p=xonotic%2Fxonotic-data.pk3dir.git

.m_glow is only needed in GAMEQC
---

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index b5bf3c361..679deb2c5 100644
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -1,4 +1,5 @@
 #pragma once
+#include <common/t_items.qh>
 
 const int IT_UNLIMITED_WEAPON_AMMO 		=  BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
 const int IT_UNLIMITED_SUPERWEAPONS		=  BIT(1); // when this bit is set, superweapons don't expire. Checkpoints can give this powerup.
@@ -45,7 +46,9 @@ CLASS(GameItem, Object)
     ATTRIB(GameItem, m_color, vector, '1 1 1');
     ATTRIB(GameItem, m_waypoint, string);
     ATTRIB(GameItem, m_waypointblink, int, 1);
+#ifdef GAMEQC
     ATTRIB(GameItem, m_glow, bool, false);
+#endif
     METHOD(GameItem, display, void(GameItem this, void(string name, string icon) returns))
     {
         TC(GameItem, this);
diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index ba4de6e03..664c37847 100644
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -26,6 +26,7 @@ REGISTER_ITEM(Strength, Powerup) {
 #ifdef GAMEQC
     this.m_model            =   MDL_Strength_ITEM;
     this.m_sound            =   SND_Strength;
+    this.m_glow             =   true;
 #endif
     this.m_name             =   "Strength Powerup";
     this.m_icon             =   "strength";
@@ -33,7 +34,6 @@ REGISTER_ITEM(Strength, Powerup) {
     this.m_waypoint         =   _("Strength");
     this.m_waypointblink    =   2;
     this.m_itemid           =   IT_STRENGTH;
-    this.m_glow             =   true;
 }
 
 #ifdef GAMEQC
@@ -45,6 +45,7 @@ REGISTER_ITEM(Shield, Powerup) {
 #ifdef GAMEQC
     this.m_model            =   MDL_Shield_ITEM;
     this.m_sound            =   SND_Shield;
+    this.m_glow             =   true;
 #endif
     this.m_name             =   "Shield";
     this.m_icon             =   "shield";
@@ -52,5 +53,4 @@ REGISTER_ITEM(Shield, Powerup) {
     this.m_waypoint         =   _("Shield");
     this.m_waypointblink    =   2;
     this.m_itemid           =   IT_INVINCIBLE;
-    this.m_glow             =   true;
 }