Remove direct server #includes from client
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 2 May 2015 04:40:48 +0000 (14:40 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 2 May 2015 04:40:48 +0000 (14:40 +1000)
54 files changed:
qcsrc/client/announcer.qc
qcsrc/client/bgmscript.qc
qcsrc/client/casings.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/damage.qc
qcsrc/client/effects.qc
qcsrc/client/gibs.qc
qcsrc/client/hook.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/laser.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/movelib.qc [new file with mode: 0644]
qcsrc/client/movelib.qh [new file with mode: 0644]
qcsrc/client/movetypes.qc
qcsrc/client/particles.qc
qcsrc/client/player_skeleton.qc
qcsrc/client/prandom.qc
qcsrc/client/progs.src
qcsrc/client/scoreboard.qc
qcsrc/client/shownames.qc
qcsrc/client/t_items.qc [new file with mode: 0644]
qcsrc/client/t_items.qh [new file with mode: 0644]
qcsrc/client/target_music.qc
qcsrc/client/teamradar.qc
qcsrc/client/tturrets.qc
qcsrc/client/tturrets.qh
qcsrc/client/tuba.qc
qcsrc/client/vehicles/bumblebee.qc [new file with mode: 0644]
qcsrc/client/vehicles/bumblebee.qh [new file with mode: 0644]
qcsrc/client/vehicles/vehicles.qc
qcsrc/client/view.qc
qcsrc/client/wall.qc
qcsrc/client/waypointsprites.qc
qcsrc/client/weapons/projectile.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/t_items.qc
qcsrc/server/vehicles/racer.qc
qcsrc/server/vehicles/racer.qh [new file with mode: 0644]
qcsrc/server/vehicles/raptor.qc
qcsrc/server/vehicles/raptor.qh [new file with mode: 0644]
qcsrc/server/vehicles/spiderbot.qc
qcsrc/server/vehicles/spiderbot.qh [new file with mode: 0644]
qcsrc/server/vehicles/vehicles.qh
qcsrc/test/compilationunit.sh
qcsrc/warpzonelib/anglestransform.qc
qcsrc/warpzonelib/client.qc
qcsrc/warpzonelib/common.qc
qcsrc/warpzonelib/mathlib.qc
qcsrc/warpzonelib/server.qc
qcsrc/warpzonelib/util_server.qc

index 5de0395..30231d1 100644 (file)
@@ -2,9 +2,11 @@
 
 #include "autocvars.qh"
 #include "main.qh"
+
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 bool announcer_1min;
index 70c4bab..d886220 100644 (file)
@@ -3,7 +3,9 @@
 #include "autocvars.qh"
 #include "defs.qh"
 #include "main.qh"
+
 #include "../common/util.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 #define CONSTANT_SPEED_DECAY
index c80c9bc..7dd7975 100644 (file)
@@ -6,6 +6,7 @@
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"
+
 #include "../common/util.qh"
 
 .float cnt;
index 5a69fbb..d905ffc 100644 (file)
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
-#include "../scoreboard.qh"
+
+#include "../../common/mapinfo.qh"
+
 #include "../../common/command/generic.qh"
 #include "../../common/command/shared_defs.qh"
-#include "../../common/mapinfo.qh"
 
 void DrawDebugModel()
 {
index 2337266..5bef3cc 100644 (file)
@@ -1,19 +1,23 @@
 #include "csqcmodel_hooks.qh"
 
+#include "autocvars.qh"
 #include "defs.qh"
 #include "gibs.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "player_skeleton.qh"
 #include "sortlist.qh"
-#include "../client/autocvars.qh"
-#include "../client/weapons/projectile.qh"
+
+#include "weapons/projectile.qh"
+
 #include "../common/animdecide.qh"
 #include "../common/csqcmodel_settings.qh"
 #include "../common/teams.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/cl_player.qh"
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 .float death_time;
index c962777..6826b03 100644 (file)
@@ -5,11 +5,15 @@
 #include "gibs.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
+
 #include "vehicles/vehicles.qh"
+
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
 #include "../common/util.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 .entity tag_entity;
index aa34ae2..077c36a 100644 (file)
@@ -1,6 +1,7 @@
 #include "effects.qh"
 
 #include "autocvars.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 /*
index 8247f6a..efdcd2e 100644 (file)
@@ -6,6 +6,7 @@
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "rubble.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
 
index 0631de6..5d8394c 100644 (file)
@@ -6,8 +6,11 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "noise.qh"
+
 #include "../common/teams.qh"
+
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/mathlib.qh"
 
index 5a6a137..0053541 100644 (file)
@@ -8,6 +8,8 @@
 #include "scoreboard.qh"
 #include "sortlist.qh"
 #include "teamradar.qh"
+#include "t_items.qh"
+
 #include "../common/buffs.qh"
 #include "../common/constants.qh"
 #include "../common/counting.qh"
@@ -15,8 +17,9 @@
 #include "../common/mapinfo.qh"
 #include "../common/nades.qh"
 #include "../common/stats.qh"
+
 #include "../csqcmodellib/cl_player.qh"
-#include "../server/t_items.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 /*
index 6a66edf..f6c3f53 100644 (file)
@@ -4,7 +4,9 @@
 #include "defs.qh"
 #include "hud.qh"
 #include "miscfunctions.qh"
+
 #include "../common/constants.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 #include "../dpdefs/keycodes.qh"
 
index f3d60d5..f0a9a45 100644 (file)
@@ -2,9 +2,12 @@
 
 #include "hook.qh"
 #include "main.qh"
+
 #include "../common/buffs.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 
index f16e85e..5eafa68 100644 (file)
 #include "target_music.qh"
 #include "tturrets.qh"
 #include "tuba.qh"
-#include "vehicles/vehicles.qh"
+#include "t_items.qh"
 #include "wall.qh"
 #include "waypointsprites.qh"
+
+#include "vehicles/bumblebee.qh"
+#include "vehicles/vehicles.qh"
+
 #include "weapons/projectile.qh"
+
 #include "../common/buffs.qh"
 #include "../common/deathtypes.qh"
 #include "../common/mapinfo.qh"
 #include "../common/notifications.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
-#include "../server/t_items.qh"
-#include "../server/vehicles/bumblebee.qh"
+
 #include "../warpzonelib/client.qh"
 
 // --------------------------------------------------------------------------
index 9b2191b..e0f8b0d 100644 (file)
@@ -6,8 +6,10 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "scoreboard.qh"
+
 #include "../common/mapinfo.qh"
 #include "../common/util.qh"
+
 #include "../dpdefs/keycodes.qh"
 
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
index d6aa38e..ae88b42 100644 (file)
@@ -5,11 +5,15 @@
 #include "hud.qh"
 #include "main.qh"
 #include "sortlist.qh"
+
 #include "../common/command/generic.qh"
+
 #include "../common/teams.qh"
 #include "../common/urllib.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/cl_model.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 void AuditLists()
diff --git a/qcsrc/client/movelib.qc b/qcsrc/client/movelib.qc
new file mode 100644 (file)
index 0000000..074f146
--- /dev/null
@@ -0,0 +1 @@
+#include "../server/movelib.qc"
diff --git a/qcsrc/client/movelib.qh b/qcsrc/client/movelib.qh
new file mode 100644 (file)
index 0000000..a0634f6
--- /dev/null
@@ -0,0 +1 @@
+#include "../server/movelib.qh"
index 6ffba0f..88b5494 100644 (file)
@@ -1,11 +1,15 @@
 #include "movetypes.qh"
 
 #include "defs.qh"
+#include "t_items.qh"
+
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/common.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
-#include "../server/t_items.qh"
+
 
 
 const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = 4;
index 334487c..24c01ce 100644 (file)
@@ -3,8 +3,10 @@
 #include "autocvars.qh"
 #include "bgmscript.qh"
 #include "main.qh"
+
 #include "../common/stats.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/common.qh"
 
 void Draw_PointParticles()
index 74064c7..9df8372 100644 (file)
@@ -1,6 +1,7 @@
 #include "player_skeleton.qh"
 
 #include "../common/csqcmodel_settings.qh"
+
 #include "../warpzonelib/anglestransform.qh"
 
 class(Skeleton) .float skeleton_info_modelindex;
index 1813009..3262488 100644 (file)
@@ -1,6 +1,7 @@
 #include "prandom.qh"
 
 #include "../dpdefs/csprogsdefs.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 // prandom - PREDICTABLE random number generator (not seeded yet)
index 7ca2e54..c66554a 100644 (file)
@@ -18,6 +18,7 @@ main.qc
 mapvoting.qc
 miscfunctions.qc
 modeleffects.qc
+movelib.qc
 movetypes.qc
 noise.qc
 particles.qc
@@ -31,13 +32,16 @@ target_music.qc
 teamradar.qc
 tturrets.qc
 tuba.qc
-vehicles/vehicles.qc
+t_items.qc
 view.qc
 wall.qc
 waypointsprites.qc
 
 command/cl_cmd.qc
 
+vehicles/bumblebee.qc
+vehicles/vehicles.qc
+
 weapons/projectile.qc // TODO
 
 ../common/animdecide.qc
@@ -63,10 +67,6 @@ weapons/projectile.qc // TODO
 ../csqcmodellib/cl_player.qc
 ../csqcmodellib/interpolate.qc
 
-../server/movelib.qc
-../server/t_items.qc
-../server/vehicles/bumblebee.qc
-
 ../warpzonelib/anglestransform.qc
 ../warpzonelib/client.qc
 ../warpzonelib/common.qc
index e31656a..da947cc 100644 (file)
@@ -6,6 +6,7 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "sortlist.qh"
+
 #include "../common/constants.qh"
 #include "../common/counting.qh"
 #include "../common/mapinfo.qh"
index 28b04b1..0ee3e51 100644 (file)
@@ -5,11 +5,14 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
+
 #include "../csqcmodellib/cl_model.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
 
 
diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc
new file mode 100644 (file)
index 0000000..c319467
--- /dev/null
@@ -0,0 +1,11 @@
+#include "autocvars.qh"
+#include "main.qh"
+#include "movetypes.qh"
+#include "../common/buffs.qh"
+#include "../common/util.qh"
+#include "../common/weapons/weapons.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/common.qh"
+#include "../dpdefs/csprogsdefs.qh"
+
+#include "../server/t_items.qc"
diff --git a/qcsrc/client/t_items.qh b/qcsrc/client/t_items.qh
new file mode 100644 (file)
index 0000000..eb01624
--- /dev/null
@@ -0,0 +1 @@
+#include "../server/t_items.qh"
index 25ce2de..d72567c 100644 (file)
@@ -3,8 +3,10 @@
 #include "autocvars.qh"
 #include "defs.qh"
 #include "main.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/common.qh"
 
 .string noise;
index 3ea3a75..2d7c327 100644 (file)
@@ -5,7 +5,9 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+
 #include "../common/util.qh"
+
 #include "../csqcmodellib/interpolate.qh"
 
 float vlen2d(vector v)
index 22bacdc..bcff5ed 100644 (file)
@@ -5,12 +5,16 @@
 #include "hud.qh"
 #include "main.qh"
 #include "miscfunctions.qh"
+#include "movelib.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "teamradar.qh"
 #include "waypointsprites.qh"
+
 #include "../common/teams.qh"
-#include "../server/movelib.qh"
+
+#include "../server/tturrets/include/turrets_early.qh"
+
 #include "../warpzonelib/anglestransform.qh"
 #include "../warpzonelib/mathlib.qh"
 
index ab651e2..bf73dc8 100644 (file)
@@ -1,8 +1,6 @@
 #ifndef TTURRETS_H
 #define TTURRETS_H
 
-#include "../server/tturrets/include/turrets_early.qh"
-
 void ent_turret();
 void turrets_precache();
 entityclass(Turret)
index 93a7a89..aa20b35 100644 (file)
@@ -2,8 +2,10 @@
 
 #include "autocvars.qh"
 #include "main.qh"
+
 #include "../common/constants.qh"
 #include "../common/util.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 #define TUBA_STARTNOTE(i, n) strcat("weapons/tuba", (i ? ftos(i) : ""), "_loopnote", ftos(n), ".wav")
diff --git a/qcsrc/client/vehicles/bumblebee.qc b/qcsrc/client/vehicles/bumblebee.qc
new file mode 100644 (file)
index 0000000..7bfe316
--- /dev/null
@@ -0,0 +1 @@
+#include "../../server/vehicles/bumblebee.qc"
diff --git a/qcsrc/client/vehicles/bumblebee.qh b/qcsrc/client/vehicles/bumblebee.qh
new file mode 100644 (file)
index 0000000..411eb36
--- /dev/null
@@ -0,0 +1 @@
+#include "../../server/vehicles/bumblebee.qh"
index 1cc9072..db1df04 100644 (file)
@@ -8,13 +8,16 @@
 #include "../movetypes.qh"
 #include "../prandom.qh"
 #include "../scoreboard.qh"
+#include "../t_items.qh"
+
 #include "../../common/buffs.qh"
 #include "../../common/constants.qh"
 #include "../../common/stats.qh"
 #include "../../common/util.qh"
+
 #include "../../csqcmodellib/cl_model.qh"
+
 #include "../../dpdefs/csprogsdefs.qh"
-#include "../../server/t_items.qh"
 
 .float cnt;
 
index 8167cb1..1a75fa0 100644 (file)
 #include "target_music.qh"
 #include "vehicles/vehicles.qh"
 #include "waypointsprites.qh"
+
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
 #include "../common/nades.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/cl_player.qh"
+
 #include "../dpdefs/csprogsdefs.qh"
+
 #include "../warpzonelib/client.qh"
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/mathlib.qh"
index 11b851f..98a2318 100644 (file)
@@ -3,7 +3,9 @@
 #include "autocvars.qh"
 #include "bgmscript.qh"
 #include "main.qh"
+
 #include "../common/util.qh"
+
 #include "../csqcmodellib/interpolate.qh"
 
 .float alpha;
index c26f42a..34c1d08 100644 (file)
@@ -6,11 +6,15 @@
 #include "main.qh"
 #include "miscfunctions.qh"
 #include "teamradar.qh"
+
 #include "../common/buffs.qh"
 #include "../common/constants.qh"
 #include "../common/teams.qh"
+
 #include "../common/weapons/weapons.qh"
+
 #include "../csqcmodellib/interpolate.qh"
+
 #include "../warpzonelib/mathlib.qh"
 
 .float alpha;
index 0da47f9..cd4f9b7 100644 (file)
@@ -4,10 +4,13 @@
 #include "../defs.qh"
 #include "../main.qh"
 #include "../movetypes.qh"
+
 #include "../../common/constants.qh"
 #include "../../common/nades.qh"
 #include "../../common/util.qh"
+
 #include "../../csqcmodellib/interpolate.qh"
+
 #include "../../warpzonelib/anglestransform.qh"
 
 .float alpha;
index 347a852..f05df28 100644 (file)
@@ -1,4 +1,5 @@
 #include "havocbot.qh"
+
 #include "role_onslaught.qc"
 #include "role_keyhunt.qc"
 #include "roles.qc"
index 1a4a758..8a5ac17 100644 (file)
@@ -1,31 +1,27 @@
-#if defined(CSQC)
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "../common/util.qh"
-    #include "../common/buffs.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../client/autocvars.qh"
-    #include "../client/movetypes.qh"
-    #include "../client/main.qh"
-    #include "../csqcmodellib/common.qh"
-    #include "../csqcmodellib/cl_model.qh"
-    #include "t_items.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../warpzonelib/util_server.qh"
-    #include "../common/constants.qh"
-    #include "../common/util.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "weapons/weaponsystem.qh"
-    #include "t_items.qh"
+#include "t_items.qh"
+
+#if defined(SVQC)
     #include "autocvars.qh"
     #include "constants.qh"
     #include "defs.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
+
     #include "mutators/mutators_include.qh"
+
+    #include "weapons/weaponsystem.qh"
+
+    #include "../common/constants.qh"
+    #include "../common/deathtypes.qh"
+    #include "../common/notifications.qh"
+    #include "../common/util.qh"
+
+    #include "../common/monsters/monsters.qh"
+
+    #include "../common/weapons/weapons.qh"
+
+    #include "../dpdefs/dpextensions.qh"
+    #include "../dpdefs/progsdefs.qh"
+
+    #include "../warpzonelib/util_server.qh"
 #endif
 
 #ifdef CSQC
index dce126c..b964195 100644 (file)
@@ -1,5 +1,4 @@
-const vector RACER_MIN = '-120 -120 -40';
-const vector RACER_MAX = '120 120 40';
+#include "racer.qh"
 
 #ifdef SVQC
 void racer_exit(float eject);
@@ -680,4 +679,4 @@ void spawnfunc_vehicle_racer()
         return;
     }
 }
-#endif // SVQC
\ No newline at end of file
+#endif // SVQC
diff --git a/qcsrc/server/vehicles/racer.qh b/qcsrc/server/vehicles/racer.qh
new file mode 100644 (file)
index 0000000..0051b77
--- /dev/null
@@ -0,0 +1,5 @@
+#ifndef RACER_H
+#define RACER_H
+const vector RACER_MIN = '-120 -120 -40';
+const vector RACER_MAX = '120 120 40';
+#endif
index 4bd2836..74d3c7a 100644 (file)
@@ -1,10 +1,4 @@
-const float RSM_FIRST = 0;
-const float RSM_BOMB = 0;
-const float RSM_FLARE = 1;
-const float RSM_LAST = 1;
-
-const vector RAPTOR_MIN = '-80 -80 0';
-const vector RAPTOR_MAX = '80 80 70';
+#include "raptor.qh"
 
 #ifdef SVQC
 float autocvar_g_vehicle_raptor;
diff --git a/qcsrc/server/vehicles/raptor.qh b/qcsrc/server/vehicles/raptor.qh
new file mode 100644 (file)
index 0000000..0043789
--- /dev/null
@@ -0,0 +1,11 @@
+#ifndef RAPTOR_H
+#define RAPTOR_H
+const float RSM_FIRST = 0;
+const float RSM_BOMB = 0;
+const float RSM_FLARE = 1;
+const float RSM_LAST = 1;
+
+const vector RAPTOR_MIN = '-80 -80 0';
+const vector RAPTOR_MAX = '80 80 70';
+
+#endif
index c969e22..10ab353 100644 (file)
@@ -1,5 +1,4 @@
-const vector SPIDERBOT_MIN = '-75 -75 10';
-const vector SPIDERBOT_MAX  = '75 75 125';
+#include "spiderbot.qh"
 
 #ifdef SVQC
 float autocvar_g_vehicle_spiderbot;
diff --git a/qcsrc/server/vehicles/spiderbot.qh b/qcsrc/server/vehicles/spiderbot.qh
new file mode 100644 (file)
index 0000000..ce96858
--- /dev/null
@@ -0,0 +1,5 @@
+#ifndef SPIDERBOT_H
+#define SPIDERBOT_H
+const vector SPIDERBOT_MIN = '-75 -75 10';
+const vector SPIDERBOT_MAX  = '75 75 125';
+#endif
index e6b9760..ec152d7 100644 (file)
@@ -2,13 +2,15 @@
 #define VEHICLES_H
 
 #ifdef VEHICLES_ENABLED
-#include "vehicles.qc"
+#   include "vehicles.qc"
 
-#include "racer.qc"
-#include "spiderbot.qc"
-#include "raptor.qc"
-#ifndef VEHICLES_NO_UNSTABLE
-#include "bumblebee.qc"
-#endif
+#   include "racer.qc"
+#   include "raptor.qc"
+#   include "spiderbot.qc"
+
+#   ifndef VEHICLES_NO_UNSTABLE
+#       include "bumblebee.qc"
+#   endif
 #endif
+
 #endif
index fb89384..7af726f 100755 (executable)
@@ -15,4 +15,10 @@ function check() {
 }
 
 clientdefs=("-DCSQC" "common/util-pre.qh" "dpdefs/csprogsdefs.qh")
-check client clientdefs[@]
+check "client" clientdefs[@]
+
+# serverdefs=("-DSVQC" "common/util-pre.qh" "server/sys-pre.qh" "dpdefs/progsdefs.qh" "dpdefs/dpextensions.qh" "server/sys-post.qh" "server/defs.qh" "server/autocvars.qh")
+# check "server" serverdefs[@]
+
+# menudefs=("-DMENUQC" "common/util-pre.qh" "dpdefs/menudefs.qh" "menu/oo/interface.qc" "menu/oo/implementation.qc")
+# check "menu" menudefs[@]
index e8a455b..079ceaa 100644 (file)
@@ -1,11 +1,11 @@
+#include "anglestransform.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-       #include "anglestransform.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
        #include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
-    #include "anglestransform.qh"
 #endif
 
 #ifdef POSITIVE_PITCH_IS_DOWN
index 5c2609a..e0bb643 100644 (file)
@@ -1,9 +1,10 @@
+#include "client.qh"
+#include "common.qh"
+
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "common.qh"
-       #include "client.qh"
        #include "../client/autocvars.qh"
        #include "../csqcmodellib/cl_model.qh"
+       #include "../dpdefs/csprogsdefs.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif
index aa0de91..0734811 100644 (file)
@@ -1,13 +1,13 @@
+#include "common.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-    #include "common.qh"
     #include "../server/t_items.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "common.qh"
     #include "../common/weapons/weapons.qh"
+    #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 void WarpZone_Accumulator_Clear(entity acc)
index c9cde90..3955470 100644 (file)
@@ -1,11 +1,10 @@
+#include "mathlib.qh"
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-    #include "mathlib.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
     #include "../dpdefs/dpextensions.qh"
-    #include "mathlib.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 int fpclassify(float x)
index a938007..bd6266e 100644 (file)
@@ -1,15 +1,16 @@
+#include "server.qh"
+
+#include "common.qh"
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-       #include "../dpdefs/dpextensions.qh"
-       #include "common.qh"
-       #include "server.qh"
        #include "../common/constants.qh"
        #include "../common/util.qh"
+       #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
+       #include "../server/command/common.qh"
        #include "../server/constants.qh"
        #include "../server/defs.qh"
-       #include "../server/command/common.qh"
 #endif
 
 #ifdef WARPZONELIB_KEEPDEBUG
index b94eafb..e82c4ba 100644 (file)
@@ -1,11 +1,13 @@
+#include "util_server.qh"
+
+#include "common.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "common.qh"
-    #include "util_server.qh"
     #include "../csqcmodellib/sv_model.qh"
+    #include "../dpdefs/dpextensions.qh"
+       #include "../dpdefs/progsdefs.qh"
 #endif
 
 void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)