From 29720af2be9354f8633f145cce4ed18b49becd28 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 4 Mar 2016 21:53:20 +1000 Subject: [PATCH] Apply a temporary hack to fix prediction of jet pack (to be killed by upcoming items branch) --- qcsrc/common/items/item/jetpack.qc | 6 +++++- qcsrc/common/items/item/powerup.qc | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 7ccbe8fa3..7fd29e299 100644 --- a/qcsrc/common/items/item/jetpack.qc +++ b/qcsrc/common/items/item/jetpack.qc @@ -5,6 +5,10 @@ #include "ammo.qh" #include "powerup.qh" +#ifndef SVQC +.int m_itemid; +#endif + #ifndef MENUQC MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3")); #endif @@ -12,6 +16,7 @@ MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3")); REGISTER_ITEM(Jetpack, Powerup) { #ifndef MENUQC this.m_model = MDL_Jetpack_ITEM; + this.m_itemid = IT_JETPACK; #endif this.m_name = "Jet pack"; this.m_icon = "jetpack"; @@ -20,7 +25,6 @@ REGISTER_ITEM(Jetpack, Powerup) { this.m_waypointblink = 2; #ifdef SVQC this.m_botvalue = BOT_PICKUP_RATING_LOW; - this.m_itemid = IT_JETPACK; this.m_pickupevalfunc = commodity_pickupevalfunc; #endif } diff --git a/qcsrc/common/items/item/powerup.qc b/qcsrc/common/items/item/powerup.qc index 7deba67df..375f958a1 100644 --- a/qcsrc/common/items/item/powerup.qc +++ b/qcsrc/common/items/item/powerup.qc @@ -1,9 +1,5 @@ #include "powerup.qh" -#ifndef SVQC -.int m_itemid; -#endif - #ifndef MENUQC MODEL(Strength_ITEM, Item_Model("g_strength.md3")); SOUND(Strength, "misc/powerup"); -- 2.39.2