Make most server includes order insensitive

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

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 358fbd011d2a5759b7c44a6fe3bc382890ac6857..b134fba43c20596903525c6eec6967b308199dd5 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,4 +1,10 @@
 #include "tuba.qh"
+#include "_.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")
 
@@ -6,11 +12,11 @@ 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;
 
@@ -24,7 +30,7 @@ void tubasound(entity e, bool restart)
                float vol2 = 0;
                float speed2 = 1;
 
-               int m = e.note % Tuba_PitchStep;
+               int m = pymod(e.note, Tuba_PitchStep);
                if (m) {
                        if (e.note - m < TUBA_MIN) {
                                if (restart) {
@@ -163,7 +169,7 @@ void Tuba_Precache()
                }
        }
        for (int n = TUBA_MIN; n <= TUBA_MAX; ++n) {
-               if (!Tuba_PitchStep || (n % Tuba_PitchStep) == 0) {
+               if (!Tuba_PitchStep || pymod(n, Tuba_PitchStep) == 0) {
                        for (int i = 0; i < TUBA_INSTRUMENTS; ++i) {
                                precache_sound(TUBA_STARTNOTE(i, n));
                        }