From 6c21d7efff5b622e0163a6c79ba6a3d3e7a75dba Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Tue, 20 Jul 2021 07:09:28 +1000 Subject: [PATCH] Enable speed and invisibility powerups to spawn, with (temporary) relic models --- .../mutators/mutator/powerups/powerup/invisibility.qh | 8 +++++--- qcsrc/common/mutators/mutator/powerups/powerup/speed.qh | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh index 85ac8bd30..d043e121f 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh @@ -9,7 +9,7 @@ #endif #ifdef GAMEQC -MODEL(Invisibility_ITEM, Item_Model("g_strength.md3")); +//MODEL(Invisibility_ITEM, Item_Model("g_strength.md3")); // TODO: new model required SOUND(Invisibility, Item_Sound("powerup")); #endif @@ -27,8 +27,10 @@ void powerup_invisibility_init(Pickup this, entity item) REGISTER_ITEM(Invisibility, Powerup) { this.m_canonical_spawnfunc = "item_invisibility"; #ifdef GAMEQC - this.spawnflags = ITEM_FLAG_MUTATORBLOCKED; // TODO: ITEM_FLAG_NORMAL (once it has a model!) - this.m_model = MDL_Invisibility_ITEM; + this.spawnflags = ITEM_FLAG_NORMAL; +// this.m_model = MDL_Invisibility_ITEM; // TODO: new model required + this.m_model = MDL_BUFF; + this.m_skin = 12; this.m_sound = SND_Invisibility; this.m_glow = true; this.m_respawnsound = SND_STRENGTH_RESPAWN; diff --git a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh index 3a55a787a..f5970dac5 100644 --- a/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh +++ b/qcsrc/common/mutators/mutator/powerups/powerup/speed.qh @@ -9,7 +9,7 @@ #endif #ifdef GAMEQC -MODEL(Speed_ITEM, Item_Model("g_invincible.md3")); +//MODEL(Speed_ITEM, Item_Model("g_invincible.md3")); // TODO: new model required SOUND(Speed, Item_Sound("powerup_shield")); #endif @@ -28,8 +28,10 @@ void powerup_speed_init(Pickup this, entity item) REGISTER_ITEM(Speed, Powerup) { this.m_canonical_spawnfunc = "item_speed"; #ifdef GAMEQC - this.spawnflags = ITEM_FLAG_MUTATORBLOCKED; // TODO: ITEM_FLAG_NORMAL (once it has a model!) - this.m_model = MDL_Speed_ITEM; + this.spawnflags = ITEM_FLAG_NORMAL; +// this.m_model = MDL_Speed_ITEM; // TODO: new model required + this.m_model = MDL_BUFF; + this.m_skin = 9; this.m_sound = SND_Speed; this.m_glow = true; this.m_respawnsound = SND_SHIELD_RESPAWN; -- 2.39.2