Merge branch 'master' into terencehill/newpanelhud

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

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index e816fe221a13bc4994deb8aaf2f90318b1364e38..1c629b6a1bec6a8a452ad9738d38976a602195eb 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -156,7 +156,7 @@ float               scoreboard_showaccuracy;
 // float               coop;
 // float               deathmatch;
 
-// float               dmg_take;
+float          dmg_take;
 // float               dmg_save;
 // vector              dmg_origin;
 
@@ -221,6 +221,7 @@ float nb_pb_period;
 
 // Spectating
 float spectatee_status;
+float prev_spectatee_status;
 
 // short mapname
 string shortmapname;
@@ -258,10 +259,18 @@ float w_deathtype, w_issilent, w_random;
 string w_deathtypestring;
 vector w_org, w_backoff;
 
-float campingrifle_scope;
+float sniperrifle_scope;
 float nex_scope;
 
 float cr_maxbullets;
 
 float bgmtime;
 
+string weaponorder_byimpulse;
+string weaponorder_bypriority;
+
+float nex_charge_movingavg;
+
+float serverflags;
+
+float uid2name_dialog;