Merge branch 'TimePath/effectinfo' into 'master'

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

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index 88db7ea21c4173cb76b404e753f85bce54a2ecdc..c8de3afdc93522a7542ce65b66e9558921688522 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -1,3 +1,8 @@
+#ifndef MAIN_H
+#define MAIN_H
+
+#include "../common/constants.qh"
+
 // --------------------------------------------------------------------------
 // MENU Functionality
 
@@ -27,7 +32,6 @@ string minimapname;
 // --------------------------------------------------------------------------
 // General stuff
 
-float drawfont;
 float postinit;
 float gametype;
 
@@ -38,7 +42,6 @@ float gametype;
 //.float ctf_state;
 //.float health;
 
-float FONT_DEFAULT = 0;
 float FONT_USER = 8;
 
 // --------------------------------------------------------------------------
@@ -92,19 +95,21 @@ entity teamslots[17];    // 17 teams (including "spectator team")
 .void(void) draw2d;
 .void(void) entremove;
 float drawframetime;
-vector view_origin, view_angles, view_forward, view_right, view_up;
+vector view_origin, view_forward, view_right, view_up;
 
 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;
 
+void Fog_Force();
+
 string getcommandkey(string text, string command);
 
 string vote_called_vote;
@@ -148,3 +153,6 @@ entity entcs_receiver[255]; // 255 is the engine limit on maxclients
 float hud;
 float view_quality;
 int framecount;
+.float health;
+
+#endif