Merge branch 'master' into terencehill/hud_cleanups

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / view.qc

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index c1d0f4791b9964ab4ed541546fa09dfa3502d84b..0e04f70136818e7dd7bfea5d583541e2a2a22a4c 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1,4 +1,3 @@
-#include "_all.qh"

 
 #include "announcer.qh"
 #include "hook.qh"
 
 #include "announcer.qh"
 #include "hook.qh"


@@ -7,23 +6,28 @@
 #include "mapvoting.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
 #include "mapvoting.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"

+#include "quickmenu.qh"

 
 #include "mutators/events.qh"
 
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"
 
 #include "mutators/events.qh"
 
 #include "../common/constants.qh"
 #include "../common/mapinfo.qh"

+#include "../common/gamemodes/all.qh"

 #include "../common/nades/all.qh"
 #include "../common/stats.qh"
 #include "../common/triggers/target/music.qh"
 #include "../common/teams.qh"
 #include "../common/nades/all.qh"
 #include "../common/stats.qh"
 #include "../common/triggers/target/music.qh"
 #include "../common/teams.qh"

-#include "../common/util.qh"

 
 

+#include "../common/vehicles/all.qh"

 #include "../common/weapons/all.qh"
 #include "../common/weapons/all.qh"

+#include "../common/viewloc.qh"
+#include "../common/minigames/cl_minigames.qh"
+#include "../common/minigames/cl_minigames_hud.qh"

 
 

-#include "../csqcmodellib/cl_player.qh"
+#include "../lib/csqcmodel/cl_player.qh"

 
 

-#include "../warpzonelib/client.qh"
-#include "../warpzonelib/common.qh"
+#include "../lib/warpzone/client.qh"
+#include "../lib/warpzone/common.qh"

 
 entity porto;
 vector polyline[16];
 
 entity porto;
 vector polyline[16];