Merge branch 'terencehill/menu_weaponarena_selection_fix' into 'master'

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

diff --git a/qcsrc/server/ent_cs.qc b/qcsrc/server/ent_cs.qc
index f63ca3de224d4daa12abde61b9e215aecde22a37..40dbf1aefa9f99822433ffbdae96ddd2fbf3cd6e 100644 (file)
--- a/qcsrc/server/ent_cs.qc
+++ b/qcsrc/server/ent_cs.qc
@@ -1,13 +1,7 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
-    #include "../dpdefs/dpextensions.qc"
-    #include "../common/constants.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-    #include "mutators/mutators_include.qh"
-#endif
+#include "_all.qh"
+
+#include "defs.qh"
+#include "mutators/mutators_include.qh"
 
 /**
  * The point of these entities is to avoid the problems
@@ -28,7 +22,7 @@
 
 void entcs_init()
 {
-       print("Initializing ClientSide information entities\n");
+       LOG_INFO("Initializing ClientSide information entities\n");
 }
 
 float entcs_customize()
@@ -48,7 +42,7 @@ float entcs_customize()
        return true;
 }
 
-float entcs_send(entity to, float sf)
+float entcs_send(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_ENTCS);
        WriteByte(MSG_ENTITY, sf);