From: terencehill Date: Tue, 2 Feb 2016 21:47:47 +0000 (+0100) Subject: Make fuel regenerator a proper powerup so that it passes checks for it.instanceOfPowe... X-Git-Tag: xonotic-v0.8.2~1197^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F280%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Make fuel regenerator a proper powerup so that it passes checks for it.instanceOfPowerup (fixes a few minor bugs) --- diff --git a/qcsrc/common/items/item/jetpack.qc b/qcsrc/common/items/item/jetpack.qc index 006a36308..7ccbe8fa3 100644 --- a/qcsrc/common/items/item/jetpack.qc +++ b/qcsrc/common/items/item/jetpack.qc @@ -1,6 +1,5 @@ #ifdef SVQC #include - #include #endif #include "ammo.qh" @@ -46,7 +45,7 @@ REGISTER_ITEM(JetpackFuel, Ammo) { MODEL(JetpackRegen_ITEM, Item_Model("g_fuelregen.md3")); #endif -REGISTER_ITEM(JetpackRegen, Pickup) { +REGISTER_ITEM(JetpackRegen, Powerup) { #ifndef MENUQC this.m_model = MDL_JetpackRegen_ITEM; #endif @@ -57,10 +56,7 @@ REGISTER_ITEM(JetpackRegen, Pickup) { this.m_waypointblink = 2; #ifdef SVQC this.m_botvalue = BOT_PICKUP_RATING_LOW; - this.m_itemflags = FL_POWERUP; this.m_itemid = IT_FUEL_REGEN; this.m_pickupevalfunc = commodity_pickupevalfunc; - this.m_respawntime = GET(g_pickup_respawntime_powerup); - this.m_respawntimejitter = GET(g_pickup_respawntimejitter_powerup); #endif } diff --git a/qcsrc/common/mutators/mutator/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime.qc index 3d91189e2..408bd6fc8 100644 --- a/qcsrc/common/mutators/mutator/itemstime.qc +++ b/qcsrc/common/mutators/mutator/itemstime.qc @@ -68,7 +68,6 @@ bool Item_ItemsTime_Allow(GameItem it) return (false || it.instanceOfPowerup || Item_ItemsTime_SpectatorOnly(it) - || it == ITEM_JetpackRegen ); }