From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 16 Oct 2020 06:53:54 +0000 (+0200)
Subject: remove unnecessary main.qh includes (also one server/player.qh include)
X-Git-Tag: xonotic-v0.8.5~734^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=db280a66b7b7ac88eaf779e80d71373c8d09cc98;p=xonotic%2Fxonotic-data.pk3dir.git

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 9f3f232cc..f65b0429d 100644
--- 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 f0ff55e8a..73452dc71 100644
--- 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 1c0f06c6a..f77ef6722 100644
--- 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 cab9d197d..dd4c59f04 100644
--- 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 495aa63fc..5a3214ad9 100644
--- 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 632f3fad5..d5c7cb8c4 100644
--- 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 11ed12e82..da2052622 100644
--- 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 587d20071..b97c80f0b 100644
--- 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 021b66856..c26e42094 100644
--- 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 deed53da0..29640c219 100644
--- 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 85fdc86c6..b4629bb81 100644
--- 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 1e688b1fd..0f2131da0 100644
--- 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 81f91663c..43125e9b5 100644
--- 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 c21b99092..c4e87a3cd 100644
--- 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 12f691c99..978851e49 100644
--- 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 b252df19e..003d88391 100644
--- 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 06a33f665..7a1726c84 100644
--- 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 05491cc8a..fcca84189 100644
--- 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 e67213e3b..130d1e74b 100644
--- 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 2b4081aba..ca1d5324c 100644
--- 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 cb5b4240c..3e1f5cade 100644
--- 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 8e671b17d..3e855c69b 100644
--- 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 77435e938..76ebc0c40 100644
--- 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 1fbe04b76..1b0c9a3da 100644
--- 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 5273179ad..b016dde9a 100644
--- 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 d5bff8f02..2e109e906 100644
--- 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 3b272e69c..07d6292bd 100644
--- 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 319a6bf64..7afc039e1 100644
--- 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 beff57489..dbfeb1240 100644
--- 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 b2d518bcc..58cf42161 100644
--- 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)