Merge branch 'master' into terencehill/quickmenu

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / tuba.qc

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index cd518e091d3c2ecdd3677aaf7c2ca50a5f6217aa..0b300d3b2e17364b889d5939143cbdf9431a2e7e 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,16 +1,22 @@
 #include "tuba.qh"
+#include "_all.qh"
 
-#define TUBA_STARTNOTE(i, n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
+#include "../common/constants.qh"
+#include "../common/util.qh"
+
+#include "../warpzonelib/mathlib.qh"
+
+#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;
 const int TUBA_INSTRUMENTS = 3;
 
-.int note;
-.bool tuba_attenuate;
-.float tuba_volume;
-.float tuba_volume_initial;
-.int tuba_instrument;
+class(Tuba) .int note;
+class(Tuba) .bool tuba_attenuate;
+class(Tuba) .float tuba_volume;
+class(Tuba) .float tuba_volume_initial;
+class(Tuba) .int tuba_instrument;
 
 int Tuba_PitchStep;