Purge server/constants.qh

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index d54dea8f70028c564ab5f0b6caa1e906182c04cd..d7dc3996f8913615e7f0707c0e30e6dfdf5b9af2 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -45,8 +45,6 @@
 #include <lib/warpzone/client.qh>
 #include <lib/warpzone/common.qh>
 
-#define EFMASK_CHEAP (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NODRAW | EF_NOSHADOW | EF_SELECTABLE | EF_TELEPORT_BIT)
-
 float autocvar_cl_viewmodel_scale;
 float autocvar_cl_viewmodel_alpha = 1;
 

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 5d9805e2ab93e46cbe68e7fd050bb1e7905e5950..344eec48cee50401790682864c2e79e97abfcd13 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -1,5 +1,30 @@
 #pragma once
 
+const int FRAGS_PLAYER = 0;
+const int FRAGS_SPECTATOR = -666;
+const int FRAGS_PLAYER_OUT_OF_GAME = -616;
+
+///////////////////////////
+// cvar constants
+
+const int CVAR_SAVE = 1;
+const int CVAR_NOTIFY = 2;
+const int CVAR_READONLY = 4;
+
+// server flags
+const int SERVERFLAG_ALLOW_FULLBRIGHT = 1;
+const int SERVERFLAG_TEAMPLAY = 2;
+const int SERVERFLAG_PLAYERSTATS = 4;
+
+const int SPECIES_HUMAN = 0;
+const int SPECIES_ROBOT_SOLID = 1;
+const int SPECIES_ALIEN = 2;
+const int SPECIES_ANIMAL = 3;
+const int SPECIES_ROBOT_RUSTY = 4;
+const int SPECIES_ROBOT_SHINY = 5;
+const int SPECIES_RESERVED = 15;
+
+#ifdef GAMEQC
 const int RANKINGS_CNT = 99;
 
 ///////////////////////////
@@ -13,13 +38,6 @@ const int KEY_CROUCH = BIT(5);
 const int KEY_ATCK = BIT(6);
 const int KEY_ATCK2 = BIT(7);
 
-///////////////////////////
-// cvar constants
-
-const int CVAR_SAVE = 1;
-const int CVAR_NOTIFY = 2;
-const int CVAR_READONLY = 4;
-
 ///////////////////////////
 // csqc communication stuff
 
@@ -30,23 +48,6 @@ const int HUD_BUMBLEBEE_GUN = 25;
 // # of maps, I'll use arrays for them :P
 const int MAPVOTE_COUNT = 30;
 
-const int SPECIES_HUMAN = 0;
-const int SPECIES_ROBOT_SOLID = 1;
-const int SPECIES_ALIEN = 2;
-const int SPECIES_ANIMAL = 3;
-const int SPECIES_ROBOT_RUSTY = 4;
-const int SPECIES_ROBOT_SHINY = 5;
-const int SPECIES_RESERVED = 15;
-
-const int FRAGS_PLAYER = 0;
-const int FRAGS_SPECTATOR = -666;
-const int FRAGS_PLAYER_OUT_OF_GAME = -616;
-
-// server flags
-const int SERVERFLAG_ALLOW_FULLBRIGHT = 1;
-const int SERVERFLAG_TEAMPLAY = 2;
-const int SERVERFLAG_PLAYERSTATS = 4;
-
 // a bit more constant
 const vector PL_MAX_CONST = '16 16 45';
 const vector PL_MIN_CONST = '-16 -16 -24';
@@ -82,3 +83,10 @@ const int FL_SPAWNING                                = BIT(16);
 const int FL_PICKUPITEMS                       = BIT(17);
 const int FL_DUCKED                            = BIT(18);
 const int FL_ONSLICK                           = BIT(19);
+#endif
+
+#if defined(SVQC)
+       #define EFMASK_CHEAP (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NODRAW | EF_NOGUNBOB | EF_NOSHADOW | EF_LOWPRECISION | EF_SELECTABLE | EF_TELEPORT_BIT)
+#elif defined(CSQC)
+       #define EFMASK_CHEAP (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NODRAW | EF_NOSHADOW | EF_SELECTABLE | EF_TELEPORT_BIT)
+#endif

diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index 395db4656612e2bfc18341b6669d92544be00b03..bf4727a79fdba674faedc71be9c98414754914a2 100644 (file)
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -2,7 +2,7 @@
 
 #ifdef SVQC
     // For FL_POWERUP
-    #include <server/constants.qh>
+    #include <common/constants.qh>
 #endif
 
 #include "pickup.qh"

diff --git a/qcsrc/common/mapobjects/target/music.qc b/qcsrc/common/mapobjects/target/music.qc
index 37ec30d645e535c3da8631af194475384ec2cc42..30413c0c658f19dcf1e4b4bba86f440578203e73 100644 (file)
--- a/qcsrc/common/mapobjects/target/music.qc
+++ b/qcsrc/common/mapobjects/target/music.qc
@@ -4,7 +4,6 @@
 #elif defined(SVQC)
     #include <common/constants.qh>
     #include <common/net_linked.qh>
-    #include <server/constants.qh>
     #include <common/weapons/_all.qh>
     #include <common/stats.qh>
 #endif

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index 93bfcbb2683e89de0a4da2cfdb96b589e2b374fc..1fbe04b76aaef52aa9be6d48e037ab20b45e6146 100644 (file)
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -11,7 +11,6 @@
     #include "../util.qh"
     #include <server/weapons/csqcprojectile.qh>
     #include <server/autocvars.qh>
-    #include <server/constants.qh>
     #include <common/weapons/_all.qh>
     #include <common/stats.qh>
     #include "../deathtypes/all.qh"

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index c46c21722b69e201802b2ade22a3b81fb8de49d9..e7eaa7cb2ec658e3a6f7ffe3f5468e3d64d119e2 100644 (file)
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -7,7 +7,6 @@
        #include <common/net_linked.qh>
        #include <common/teams.qh>
        #include <server/autocvars.qh>
-       #include <server/constants.qh>
        #include <server/world.qh>
        #include <server/mutators/_mod.qh>
 #endif

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index dc87d6b6276f74cf20c5a74f8df655af49ab1492..b5bf64a781c517db36bc15c2b8abeed5e868d5ce 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -33,7 +33,6 @@
     #include <server/weapons/tracing.qh>
     #include <server/items/spawning.qh>
     #include <server/autocvars.qh>
-    #include <server/constants.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
     #include <server/mutators/_mod.qh>

diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc
index ee70983f8f58b4c1a36761ef37b898c7a271c2b4..1036ab0c8d2e1177981f957d0044e37913da3f5e 100644 (file)
--- a/qcsrc/lib/warpzone/server.qc
+++ b/qcsrc/lib/warpzone/server.qc
@@ -9,7 +9,6 @@
        #include <common/mapobjects/subs.qh>
        #include <common/mapobjects/teleporters.qh>
        #include <common/util.qh>
-       #include <server/constants.qh>
        #include <common/weapons/_all.qh>
        #include <common/stats.qh>
        #include <server/utils.qh>

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index e8f810231baf45744c1186e9aaf45a03130a5d65..c42a053f45c8a421a8a0fff54fa1ade1023e172d 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -16,7 +16,6 @@
 #include "../../autocvars.qh"
 #include "../../campaign.qh"
 #include "../../client.qh"
-#include "../../constants.qh"
 #include <common/stats.qh>
 #include <server/world.qh>
 #include <server/damage.qh>

diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh
index 8e5ee757f649da5414aeff81e7245fc291894548..e288bebfcb27ad10248c46fdd8ec2acbb22f1ecd 100644 (file)
--- a/qcsrc/server/client.qh
+++ b/qcsrc/server/client.qh
@@ -280,11 +280,17 @@ bool independent_players;
 
 .float respawn_countdown; // next number to count
 
+const int RESPAWN_FORCE = BIT(0);
+const int RESPAWN_SILENT = BIT(1);
+const int RESPAWN_DENY = BIT(2);
+
 float blockSpectators; // if set, new or existing spectators or observers will be removed unless they become a player within g_maxplayers_spectator_blocktime seconds
 .float spectatortime; // point in time since the client is spectating or observing
 
 .bool player_blocked;
 
+const int SVC_SETVIEW = 5; // TODO: move to dpdefs where this belongs!
+
 // TODO: standardise resource regeneration
 .float pauseregen_finished;
 .float pauserothealth_finished;

diff --git a/qcsrc/server/constants.qh b/qcsrc/server/constants.qh
deleted file mode 100644 (file)
index 354151c..0000000
--- a/qcsrc/server/constants.qh
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-const int SVC_SETVIEW = 5;
-
-const int RESPAWN_FORCE = BIT(0);
-const int RESPAWN_SILENT = BIT(1);
-const int RESPAWN_DENY = BIT(2);
-
-#define EFMASK_CHEAP (EF_ADDITIVE | EF_DOUBLESIDED | EF_FULLBRIGHT | EF_NODEPTHTEST | EF_NODRAW | EF_NOGUNBOB | EF_NOSHADOW | EF_LOWPRECISION | EF_SELECTABLE | EF_TELEPORT_BIT)
-
-const int NUM_PLAYERSKINS_TEAMPLAY = 3;

diff --git a/qcsrc/server/damage.qh b/qcsrc/server/damage.qh
index 14dbaf0740ab1bf5ae7f72ed99db015c004eec21..02a637ca005aea0f233fc22145286ba1cfa92c7a 100644 (file)
--- a/qcsrc/server/damage.qh
+++ b/qcsrc/server/damage.qh
@@ -16,7 +16,6 @@
     #include "weapons/csqcprojectile.qh"
     #include "weapons/selection.qh"
     #include "autocvars.qh"
-    #include "constants.qh"
     #include <common/notifications/all.qh>
     #include <common/deathtypes/all.qh>
     #include <server/mutators/_mod.qh>

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 1a751984ddb07942236986aa5996f33f3e46513b..e8b4ab681c5bb91a64e7ef650dd89c2dfd3018cd 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -3,7 +3,6 @@
 #include "antilag.qh"
 #include "command/common.qh"
 #include "client.qh"
-#include "constants.qh"
 #include "damage.qh"
 #include "hook.qh"
 #include "world.qh"