Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

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

diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc
index 7bc3b9b1aa45eeacefd1a77d6887e95137a7e46c..697cae91ca3296d36c9d0c79612bb575a7ab4e38 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -1,13 +1,7 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/util.qh"
-       #include "autocvars.qh"
-       #include "bgmscript.qh"
-       #include "main.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "bgmscript.qh"
+#include "_all.qh"
+
+#include "../common/util.qh"
 
 #define CONSTANT_SPEED_DECAY
 
@@ -177,7 +171,7 @@ float GetTimeForAmplitude(entity e, float amp)
        }
 }
 
-float BGMScript(entity e)
+float doBGMScript(entity e)
 {
        float amp, vel;