Merge branch 'master' into Mario/showspecs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qh

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index f407875e1de6c1eeb12ef9ce4e46ceeabd3caffe..bf0bb74b0c0ab2fffd46441ddaa6ce1a1decb6b1 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,55 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#if defined(CSQC)
-    #include "../common/util-pre.qh"
-    #include "sys-pre.qh"
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "sys-post.qh"
-    #include "defs.qh"
-    #include "../dpdefs/keycodes.qh"
-    #include "../common/constants.qh"
-    #include "../common/stats.qh"
-    #include "../warpzonelib/anglestransform.qh"
-    #include "../warpzonelib/mathlib.qh"
-    #include "../warpzonelib/common.qh"
-    #include "../warpzonelib/client.qh"
-    #include "../common/playerstats.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/nades.qh"
-    #include "../common/buffs.qh"
-    #include "../common/test.qh"
-    #include "../common/counting.qh"
-    #include "../common/weapons/weapons.qh"
-    #include "../common/mapinfo.qh"
-    #include "../common/command/markup.qh"
-    #include "../common/command/rpn.qh"
-    #include "../common/command/generic.qh"
-    #include "../common/command/shared_defs.qh"
-    #include "../common/urllib.qh"
-    #include "../common/animdecide.qh"
-    #include "command/cl_cmd.qh"
-    #include "../common/monsters/monsters.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "damage.qh"
-    #include "../csqcmodellib/interpolate.qh"
-    #include "teamradar.qh"
-    #include "hud.qh"
-    #include "scoreboard.qh"
-    #include "waypointsprites.qh"
-    #include "movetypes.qh"
-    #include "prandom.qh"
-    #include "bgmscript.qh"
-    #include "noise.qh"
-    #include "tturrets.qh"
-    #include "../server/tturrets/include/turrets_early.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
 // --------------------------------------------------------------------------
 // MENU Functionality
 
@@ -148,9 +99,9 @@ float button_zoom;
 float spectatorbutton_zoom;
 float button_attack2;
 
-float activeweapon;
-float switchingweapon;
-float switchweapon;
+int activeweapon;
+int switchingweapon;
+int switchweapon;
 float current_viewzoom;
 float zoomin_effect;
 float warmup_stage;
@@ -197,5 +148,10 @@ entity entcs_receiver[255]; // 255 is the engine limit on maxclients
 
 float hud;
 float view_quality;
+
+int num_spectators;
+const int MAX_SPECTATORS = 7;
+int spectatorlist[MAX_SPECTATORS];
+
 int framecount;
-#endif
\ No newline at end of file
+#endif