Add a wrapper for item sounds, so they can be easily replaced like weapon sounds...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / instagib / items.qh

diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh
index 269ec2d245ea02cc473e1345cd02aad9b585e598..1efa4cbdc1d221d0a19adc9c33cb6f048706bb7e 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/items.qh
+++ b/qcsrc/common/mutators/mutator/instagib/items.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 #include <common/items/item/ammo.qh>
 #include <common/items/item/powerup.qh>
 
@@ -9,13 +9,13 @@ float instagib_respawntimejitter_ammo = 0;
 GETTER(float, instagib_respawntime_ammo)
 GETTER(float, instagib_respawntimejitter_ammo)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(VaporizerCells_ITEM, Item_Model("a_cells.md3"));
-SOUND(VaporizerCells, "misc/itempickup");
+SOUND(VaporizerCells, Item_Sound("itempickup"));
 #endif
 
 REGISTER_ITEM(VaporizerCells, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_VaporizerCells_ITEM;
     this.m_sound                =   SND_VaporizerCells;
 #endif
@@ -29,13 +29,13 @@ REGISTER_ITEM(VaporizerCells, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ExtraLife_ITEM, Item_Model("g_h100.md3"));
-SOUND(ExtraLife, "misc/megahealth");
+SOUND(ExtraLife, Item_Sound("megahealth"));
 #endif
 
 REGISTER_ITEM(ExtraLife, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ExtraLife_ITEM;
     this.m_sound                =   SND_ExtraLife;
 #endif
@@ -47,13 +47,13 @@ REGISTER_ITEM(ExtraLife, Powerup) {
     this.m_itemid               =   IT_NAILS;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Invisibility_ITEM, Item_Model("g_strength.md3"));
-SOUND(Invisibility, "misc/powerup");
+SOUND(Invisibility, Item_Sound("powerup"));
 #endif
 
 REGISTER_ITEM(Invisibility, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Invisibility_ITEM;
     this.m_sound            =   SND_Invisibility;
 #endif
@@ -65,13 +65,13 @@ REGISTER_ITEM(Invisibility, Powerup) {
     this.m_itemid           =   IT_STRENGTH;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Speed_ITEM, Item_Model("g_invincible.md3"));
-SOUND(Speed, "misc/powerup_shield");
+SOUND(Speed, Item_Sound("powerup_shield"));
 #endif
 
 REGISTER_ITEM(Speed, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Speed_ITEM;
     this.m_sound            =   SND_Speed;
 #endif