Add a hack to fix the use of self in .predraw functions

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index f407875e1de6c1eeb12ef9ce4e46ceeabd3caffe..31db3f86e7217733a044b282caaa8dabe7d31ec3 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,54 +1,8 @@
-#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
+#ifndef CLIENT_MAIN_H
+#define CLIENT_MAIN_H
+
+#include <common/constants.qh>
+#include <common/weapons/all.qh>
 
 // --------------------------------------------------------------------------
 // MENU Functionality
@@ -60,12 +14,7 @@ const float DATABUF_PING = 0;
 
 #define DATABUF_NEXT (5*maxclients)
 
-void() menu_show_error;
-void() menu_sub_null;
-
-float menu_visible;
-var void() menu_show;
-var float(float bInputType, float nPrimary, float nSecondary) menu_action;
+void setpredraw(entity this, void(entity) pdfunc);
 
 // --------------------------------------------------------------------------
 // Onslaught
@@ -138,23 +87,25 @@ entity teamslots[17];    // 17 teams (including "spectator team")
 .float ready;
 .float eliminated;
 
-.void(void) draw;
-.void(void) draw2d;
-.void(void) entremove;
+.void(entity) draw;
+.void(entity) draw2d;
+.void(entity) entremove;
 float drawframetime;
 vector view_origin, view_forward, view_right, view_up;
 
-float button_zoom;
-float spectatorbutton_zoom;
-float button_attack2;
+bool button_zoom;
+bool spectatorbutton_zoom;
+bool button_attack2;
 
-float activeweapon;
-float switchingweapon;
-float switchweapon;
+Weapon activeweapon;
+Weapon switchingweapon;
+Weapon switchweapon;
 float current_viewzoom;
 float zoomin_effect;
 float warmup_stage;
 
+void Fog_Force();
+
 string getcommandkey(string text, string command);
 
 string vote_called_vote;
@@ -187,15 +138,11 @@ const int HOOK_END =      2;
 
 .float ping, ping_packetloss, ping_movementloss;
 
-float g_balance_mortar_bouncefactor;
-float g_balance_mortar_bouncestop;
-float g_balance_electro_secondary_bouncefactor;
-float g_balance_electro_secondary_bouncestop;
 float g_trueaim_minrange;
 
-entity entcs_receiver[255]; // 255 is the engine limit on maxclients
-
 float hud;
 float view_quality;
 int framecount;
-#endif
\ No newline at end of file
+.float health;
+
+#endif