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 d88622070bc654d16c25fac27d2295c9d3e5008a..697cae91ca3296d36c9d0c79612bb575a7ab4e38 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -1,13 +1,8 @@
 #include "bgmscript.qh"
-
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
+#include "_all.qh"
 
 #include "../common/util.qh"
 
-#include "../dpdefs/csprogsdefs.qh"
-
 #define CONSTANT_SPEED_DECAY
 
 float bgmscriptbuf;
@@ -176,7 +171,7 @@ float GetTimeForAmplitude(entity e, float amp)
        }
 }
 
-float BGMScript(entity e)
+float doBGMScript(entity e)
 {
        float amp, vel;