Merge branch 'master' into TimePath/vehicles_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_casings.qc

diff --git a/qcsrc/server/g_casings.qc b/qcsrc/server/g_casings.qc
index e43d66fdc3c51ef9d3c108b643f9490e5e885ff4..b9ad94e3f3910ec90f254a9a4ded0b3f2e9646e7 100644 (file)
--- a/qcsrc/server/g_casings.qc
+++ b/qcsrc/server/g_casings.qc
@@ -1,14 +1,8 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-#endif
+#include "_all.qh"
 
-float Casing_SendEntity(entity to, float sf)
+#include "../common/util.qh"
+
+float Casing_SendEntity(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_CASING);
        WriteByte(MSG_ENTITY, self.state); // actually type
@@ -22,7 +16,7 @@ float Casing_SendEntity(entity to, float sf)
        return true;
 }
 
-void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, float casingtype, entity casingowner)
+void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner)
 {
        entity e;
        vector org;