Tidy up classnames

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

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 4ef6b2f793b819805c3a78c5f0fb0e32f190ab2d..9b96feb3b28c5eab623df4e13b2dd7e55245f060 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -1,8 +1,13 @@
 #include "ent_cs.qh"
-#include <common/gamemodes/_mod.qh>
-#include <common/resources.qh>
-#ifdef SVQC
-#include <server/resources.qh>
+
+#if defined(CSQC)
+       #include <common/gamemodes/_mod.qh>
+       #include <common/resources.qh>
+#elif defined(MENUQC)
+#elif defined(SVQC)
+       #include <common/gamemodes/_mod.qh>
+       #include <common/resources.qh>
+       #include <server/resources.qh>
 #endif
 
 REGISTRY(EntCSProps, BITS(16) - 1)
@@ -269,7 +274,7 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                {
                        if (!this)
                                // initial = temp
-                               e = new_pure(entcs_receiver);
+                               e = new_pure(ENT_CLIENT_ENTCS);
                        else
                                // initial = linked
                                e = this;
@@ -305,7 +310,6 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                if (isnew)
                {
                        make_pure(this);
-                       this.classname = "entcs_receiver";
                        this.entremove = Ent_RemoveEntCS;
                }
                return ReadEntcs(this);