remove unnecessary main.qh includes (also one server/player.qh include)

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 9f3f232ccdc26dd2ef0a0dd789c7e20ef0f42dfb..f65b0429da7523ded29b5e30eee157574e4cf6eb 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -14,7 +14,6 @@
 #include <client/hud/panel/radar.qh>
 #include <client/hud/panel/scoreboard.qh>
 #include <client/hud/panel/vote.qh>
-#include "../main.qh"
 #include "../mapvoting.qh"
 #include <client/view.qh>
 

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index f0ff55e8ab56a09021c507bfd963d6a72a19a3dd..73452dc7119dfa7e1697a0e61b49ea917eba48a3 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,8 +1,6 @@
 #include "csqcmodel_hooks.qh"
 #include "autocvars.qh"
-#include "main.qh"
 #include <client/mutators/_mod.qh>
-#include <client/main.qh>
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
 #include <common/animdecide.qh>

diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc
index 1c0f06c6ad5fb949982a751830c3199590ed4fce..f77ef67228332b49da67dea8a9b06d9d655c2a13 100644 (file)
--- a/qcsrc/client/hud/crosshair.qc
+++ b/qcsrc/client/hud/crosshair.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <client/hud/panel/scoreboard.qh>
 #include <client/view.qh>
 

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index cab9d197d0aa6d3f29420d311f6e01f7eb3405a6..dd4c59f04dc7442b073329211d9bb3bf6f79560a 100644 (file)
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -3,7 +3,6 @@
 #include <client/autocvars.qh>
 #include <client/draw.qh>
 #include <client/items/items.qh>
-#include <client/main.qh>
 #include <client/view.qh>
 #include <common/wepent.qh>
 #include <common/mutators/mutator/nades/nades.qh>

diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc
index 495aa63fc609df9ecf9e82c4335a78c0857aa048..5a3214ad99e15a91cd8320951ec9cd8bbd6fa437 100644 (file)
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@ -1,7 +1,6 @@
 #include "healtharmor.qh"
 
 #include <client/draw.qh>
-#include <client/main.qh>
 
 #include <common/deathtypes/all.qh>
 

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index 632f3fad5425382625ada01d0774c8d2ca4dcf9f..d5c7cb8c45685a7d40a99bd5377a1094f91cbf11 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 
 #include <common/ent_cs.qh>
 

diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc
index 11ed12e82198461227226777c77aac57f8d37f2b..da205262229150e1a10a4113c594f638af490ebd 100644 (file)
--- a/qcsrc/client/hud/panel/physics.qc
+++ b/qcsrc/client/hud/panel/physics.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <lib/csqcmodel/cl_player.qh>
 
 // Physics (#15)

diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc
index 587d2007133b2eeae57402090e4a070fece253d4..b97c80f0b3a56b21363c1783b64bad277d06856c 100644 (file)
--- a/qcsrc/client/hud/panel/powerups.qc
+++ b/qcsrc/client/hud/panel/powerups.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <common/items/_mod.qh>
 #include <common/util.qh>
 

diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc
index 021b66856d08733187bea69e9c7dff9bd70ecec2..c26e42094104e1bc8b4ac77ee84d6f8601f941d8 100644 (file)
--- a/qcsrc/client/hud/panel/pressedkeys.qc
+++ b/qcsrc/client/hud/panel/pressedkeys.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 
 // Pressed keys (#11)
 

diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc
index deed53da01e0323fc7bef89349f4431b38271c68..29640c219bc3b2853a4dede52491163e8e65e37d 100644 (file)
--- a/qcsrc/client/hud/panel/quickmenu.qc
+++ b/qcsrc/client/hud/panel/quickmenu.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <common/ent_cs.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <client/hud/_mod.qh>

diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc
index 85fdc86c6635d7a85ee1da6d6ac1cda52cc0dbe7..b4629bb81c320efe30cc1981ef95c7d93a662ffa 100644 (file)
--- a/qcsrc/client/hud/panel/racetimer.qc
+++ b/qcsrc/client/hud/panel/racetimer.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 
 // Race timer (#8)
 

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 1e688b1fde229e5fc547e722951338e6ce795998..0f2131da065e49c12561948e8dd239feb001bfbe 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <common/ent_cs.qh>
 #include <client/mapvoting.qh>
 #include <client/resources.qh>

diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc
index 81f91663c2d3436ff3022f5a0e7a63ed7f7e36bb..43125e9b5017385a5101e6b1edf42f5aabda25c1 100644 (file)
--- a/qcsrc/client/hud/panel/score.qc
+++ b/qcsrc/client/hud/panel/score.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/scores.qh>

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index c21b990921f7d6a38ae489afc395a2af7246fde0..c4e87a3cd9f15c4bfccc9892bc569e5cea728056 100644 (file)
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <client/hud/panel/racetimer.qh>
 #include <client/hud/panel/weapons.qh>
 #include "quickmenu.qh"

diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc
index 12f691c992001597cfa34627d5dd3243a2574e91..978851e4919f638bce14b52584ddf6d6e3d50fb0 100644 (file)
--- a/qcsrc/client/hud/panel/vote.qc
+++ b/qcsrc/client/hud/panel/vote.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 
 // Vote (#9)
 

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index b252df19e8d9c7a64a89ac7385aef3ca73a80072..003d88391545f7fc61f66b00b4b9a71ae2704a54 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-#include <client/main.qh>
 #include <client/view.qh>
 #include <common/wepent.qh>
 

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 06a33f665e4932e1361292c3e2c79003d08c0273..7a1726c8466a7231278afd9cc9993629542d3611 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -2,7 +2,6 @@
 
 #include "autocvars.qh"
 #include <client/draw.qh>
-#include "main.qh"
 #include "hud/_mod.qh"
 #include "hud/panel/scoreboard.qh"
 

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 05491cc8a437b7dc44c393750a447952007a06a4..fcca84189f697a9ac0e1d18368abc5384ae17a85 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -2,7 +2,6 @@
 
 #include "autocvars.qh"
 #include <client/draw.qh>
-#include "main.qh"
 #include "resources.qh"
 #include <client/view.qh>
 #include "hud/_mod.qh"

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index e67213e3b9ab04361386b96d16e368c5a4b87b05..130d1e74b72e45c2d27000a832800ed6b0d1288b 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -2,7 +2,6 @@
 
 #include "autocvars.qh"
 #include "hud/_mod.qh"
-#include <client/main.qh>
 
 #include <common/mutators/mutator/waypoints/all.qh>
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 2b4081aba8a477e379105df27480434754d77082..ca1d5324cb72aa5d27083d5a4d9ff715179a75d0 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -4,7 +4,6 @@
 #include <client/draw.qh>
 #include "announcer.qh"
 #include "hud/_mod.qh"
-#include "main.qh"
 #include "mapvoting.qh"
 #include "shownames.qh"
 #include "hud/panel/scoreboard.qh"

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index cb5b4240c956795910a50596ee69fbd21e30b0e0..3e1f5cade690e0db50fd703d9eae898e59fe0f61 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -1,7 +1,6 @@
 #include "projectile.qh"
 
 #include "../autocvars.qh"
-#include "../main.qh"
 #include <client/mutators/_mod.qh>
 
 #include <common/constants.qh>

diff --git a/qcsrc/common/effects/qc/globalsound.qc b/qcsrc/common/effects/qc/globalsound.qc
index 8e671b17d755c574d72c8eac4c0b997567154cca..3e855c69b253f659235a04eee0840880a3254af2 100644 (file)
--- a/qcsrc/common/effects/qc/globalsound.qc
+++ b/qcsrc/common/effects/qc/globalsound.qc
@@ -4,13 +4,6 @@
 
        #include <common/animdecide.qh>
 
-       #ifdef SVQC
-               #include <server/player.qh>
-       #endif
-       #ifdef CSQC
-               #include <client/main.qh>
-       #endif
-
        REGISTER_NET_TEMP(globalsound)
        REGISTER_NET_TEMP(playersound)
 

diff --git a/qcsrc/common/mapobjects/misc/laser.qc b/qcsrc/common/mapobjects/misc/laser.qc
index 77435e938b405cf5b013b07b56283f12383bb68f..76ebc0c4067603ff93a3f41738f2d6b88d8312c1 100644 (file)
--- a/qcsrc/common/mapobjects/misc/laser.qc
+++ b/qcsrc/common/mapobjects/misc/laser.qc
@@ -1,7 +1,6 @@
 #include "laser.qh"
 #if defined(CSQC)
        #include <lib/csqcmodel/interpolate.qh>
-       #include <client/main.qh>
        #include <lib/csqcmodel/cl_model.qh>
 #elif defined(MENUQC)
 #elif defined(SVQC)

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index 1fbe04b76aaef52aa9be6d48e037ab20b45e6146..1b0c9a3da30445db53de7c185be7f7965370c394 100644 (file)
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -14,7 +14,6 @@
     #include <common/weapons/_all.qh>
     #include <common/stats.qh>
     #include "../deathtypes/all.qh"
-    #include <server/main.qh>
     #include "../turrets/sv_turrets.qh"
     #include "../vehicles/all.qh"
     #include <common/gamemodes/_mod.qh>

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index 5273179adfeb047faeea7f8d7c7ab518cebc9d60..b016dde9a19287d7e8c9e77ede292ee22c69c6cb 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -2,7 +2,6 @@
 // TODO: split target_push and put it in the target folder
 #ifdef SVQC
 #include <common/physics/movetypes/movetypes.qh>
-#include <server/main.qh>
 
 void trigger_push_use(entity this, entity actor, entity trigger)
 {

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index d5bff8f0239f682727e8e09eac47c221329b3037..2e109e90692a0d7aa3795834a5f881011f66085c 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -15,7 +15,6 @@
 #include <server/items/items.qh>
 #include <server/mutators/_mod.qh>
 #include <server/steerlib.qh>
-#include <server/main.qh>
 #include "../turrets/sv_turrets.qh"
 #include "../turrets/util.qh"
 #include "../vehicles/all.qh"

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 3b272e69c87210a4c395c4c1242278b7466679a5..07d6292bd9efc39f51800795ce777286104b3970 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -3,7 +3,6 @@
 #include <common/mapobjects/target/music.qh>
 #include <common/gamemodes/_mod.qh>
 #include <server/items/items.qh>
-#include <server/main.qh>
 
 void buffs_DelayedInit(entity this);
 

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index 319a6bf641ec06a7eb50d18bc0a64d58fd287c4a..7afc039e1598df368e6278d54e32bbd806ec7fff 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -7,7 +7,6 @@
 #include <server/client.qh>
 #include <common/mapobjects/defs.qh>
 #include "../mapobjects/trigger/viewloc.qh"
-#include <server/main.qh>
 
 // client side physics
 bool Physics_Valid(string thecvar)

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index beff57489779392c07f7e1ccc876d56eb10bed4c..dbfeb1240f3858db0cb677262f805a350002828c 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -8,7 +8,6 @@
 #include <common/mapobjects/defs.qh>
 #include <common/mapobjects/teleporters.qh>
 #include <common/mapobjects/triggers.qh>
-#include <server/main.qh>
 #include <server/weapons/common.qh>
 
 bool SendAuxiliaryXhair(entity this, entity to, int sf)

diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc
index b2d518bcc6134ae4e20018ccf93a412a527cbd63..58cf42161c7dc52ae7aa3d99f5ec7c585d2fef7e 100644 (file)
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@ -2,7 +2,6 @@
 #include "util.qh"
 
 #if defined(CSQC)
-    #include <client/main.qh>
     #include "constants.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)