Merge branch 'master' into Lyberta/TeamplayFixes_

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

diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh
index d3db0ebfde08cfdd0763fbe46b49b33cf9528ae2..9a5335eff06b7c4ca56a73b17d3324b2a2b9618e 100644 (file)
--- a/qcsrc/client/defs.qh
+++ b/qcsrc/client/defs.qh
@@ -1,5 +1,4 @@
-#ifndef CLIENT_DEFS_H
-#define CLIENT_DEFS_H
+#pragma once
 
 // Additional OPTIONAL Fields and Globals
 //float                intermission;
@@ -28,7 +27,7 @@ float         dmg_take;
 .int team;
 .int team_size;
 
-float vid_conwidth, vid_conheight;
+float vid_conheight;
 int binddb;
 
 // QUALIFYING
@@ -37,9 +36,11 @@ float race_time;
 float race_laptime;
 float race_checkpointtime;
 float race_previousbesttime;
+float race_mypreviousbesttime;
 string race_previousbestname;
 float race_nextcheckpoint;
 float race_nextbesttime;
+float race_mybesttime;
 string race_nextbestname;
 float race_penaltyaccumulator; // qualifying: total penalty time in tenths
 float race_penaltyeventtime; // time when the player got the penalty
@@ -48,8 +49,10 @@ string race_penaltyreason; // reason for penalty
 float race_server_record; // server record
 float race_speedaward;
 string race_speedaward_holder;
+string race_speedaward_unit;
 float race_speedaward_alltimebest;
 string race_speedaward_alltimebest_holder;
+string race_speedaward_alltimebest_unit;
 
 // RACE
 float race_mycheckpoint;
@@ -71,6 +74,9 @@ float race_myrank;
 float nb_pb_period;
 
 // Spectating
+// -1 - observing
+// 0 - playing
+// >0 - id of spectated player
 float spectatee_status;
 
 // short mapname
@@ -87,7 +93,7 @@ vector lightning_shotorigin[4];
 float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power;
 #endif
 
-float servertime, serverprevtime, serverdeltatime;
+float serverprevtime, serverdeltatime;
 
 float ticrate;
 
@@ -97,10 +103,6 @@ const float MAX_DAMAGEEXTRARADIUS = 16;
 .float damageextraradius;
 .void(entity this, float thisdmg, int hittype, vector org, vector thisforce) event_damage;
 
-// only for Porto
-float angles_held_status;
-vector angles_held;
-
 // weapons
 .bool silent;
 
@@ -119,8 +121,8 @@ int serverflags;
 
 float uid2name_dialog;
 
+float intermission_time;
+
 .bool csqcmodel_isdead; // used by shownames and miscfunctions (entcs_IsDead) to know when a player is dead
 
 #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)
-
-#endif