X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftuba.qc;h=ed2964936a3bd3942ba90cf1af2921c5d5197fcd;hb=f93bcb5dd8686abd0b407df953ad211f3265eb91;hp=93a7a8954356c526014e20aa55ac07a1103e79b8;hpb=79f8e8d5cfdd67d25f574bebec19d0a6f31eb20a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 93a7a8954..ed2964936 100644
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,12 +1,9 @@
 #include "tuba.qh"
 
-#include "autocvars.qh"
-#include "main.qh"
 #include "../common/constants.qh"
-#include "../common/util.qh"
-#include "../warpzonelib/mathlib.qh"
 
-#define TUBA_STARTNOTE(i, n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
+
+#define TUBA_STARTNOTE(i, n) W_Sound(strcat("tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n)))
 
 const int TUBA_MIN = -18;
 const int TUBA_MAX = 27;
@@ -66,12 +63,12 @@ void tubasound(entity e, bool restart)
 		if (restart) {
 			snd1 = TUBA_STARTNOTE(e.tuba_instrument, e.note);
 		}
-		sound(e, CH_TUBA_SINGLE, snd1, e.tuba_volume, e.tuba_attenuate * autocvar_g_balance_tuba_attenuation);
+		_sound(e, CH_TUBA_SINGLE, snd1, e.tuba_volume, e.tuba_attenuate * autocvar_g_balance_tuba_attenuation);
 	}
 }
 
 void Ent_TubaNote_Think()
-{
+{SELFPARAM();
 	float f = autocvar_g_balance_tuba_fadetime;
 	if (f > 0) {
 		self.tuba_volume -= frametime * self.tuba_volume_initial / f;
@@ -80,9 +77,9 @@ void Ent_TubaNote_Think()
 	}
 	self.nextthink = time;
 	if (self.tuba_volume <= 0) {
-		sound(self, CH_TUBA_SINGLE, "misc/null.wav", 0, 0);
+		sound(self, CH_TUBA_SINGLE, SND_Null, 0, 0);
 		if (self.enemy) {
-			sound(self.enemy, CH_TUBA_SINGLE, "misc/null.wav", 0, 0);
+			sound(self.enemy, CH_TUBA_SINGLE, SND_Null, 0, 0);
 			remove(self.enemy);
 		}
 		remove(self);
@@ -92,7 +89,7 @@ void Ent_TubaNote_Think()
 }
 
 void Ent_TubaNote_UpdateSound()
-{
+{SELFPARAM();
 	self.enemy.tuba_volume = bound(0, VOL_BASE * autocvar_g_balance_tuba_volume, 1);
 	self.enemy.tuba_volume_initial = self.enemy.tuba_volume;
 	self.enemy.note = self.note;
@@ -101,13 +98,13 @@ void Ent_TubaNote_UpdateSound()
 }
 
 void Ent_TubaNote_StopSound()
-{
+{SELFPARAM();
 	self.enemy.nextthink = time;
 	self.enemy = world;
 }
 
 void Ent_TubaNote(bool isNew)
-{
+{SELFPARAM();
 	bool upd = false;
 	int f = ReadByte();
 	if (f & 1) {
@@ -164,7 +161,7 @@ void Tuba_Precache()
 	Tuba_PitchStep = autocvar_g_balance_tuba_pitchstep;
 	if (Tuba_PitchStep) {
 		if (!checkextension("DP_SND_SOUND7_WIP2") && !checkextension("DP_SND_SOUND7")) {
-			print("^1NOTE:^7 requested pitch shifting, but not supported by this engine build\n");
+			LOG_INFO("^1NOTE:^7 requested pitch shifting, but not supported by this engine build\n");
 			Tuba_PitchStep = 0;
 		}
 	}