]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Enable speed and invisibility powerups to spawn, with (temporary) relic models
authorbones_was_here <bones_was_here@xa.org.au>
Mon, 19 Jul 2021 21:09:28 +0000 (07:09 +1000)
committerbones_was_here <bones_was_here@xa.org.au>
Mon, 19 Jul 2021 21:09:28 +0000 (07:09 +1000)
qcsrc/common/mutators/mutator/powerups/powerup/invisibility.qh
qcsrc/common/mutators/mutator/powerups/powerup/speed.qh

index 85ac8bd309f1dc4120589040922a9b3485502e2a..d043e121fb421029203e23f1dba5ce0f6d3a8cdb 100644 (file)
@@ -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;
index 3a55a787a33bf46fad10fb169c1187a83e7fcf74..f5970dac50fc414b1ad271d5862dabee66c030ae 100644 (file)
@@ -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;