Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage...

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

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index 1b019d5be89d63aa3caa0b0831fc5005a2b77d8a..88f0a51b0673e17f6984e4b27bf673ad0b5f3a5b 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;
 
@@ -259,3 +259,17 @@ string w_deathtypestring;
 vector w_org, w_backoff;
 
 float campingrifle_scope;
+float nex_scope;
+
+float cr_maxbullets;
+
+float bgmtime;
+
+string weaponorder_byimpulse;
+string weaponorder_bypriority;
+
+float nex_charge_movingavg;
+
+float serverflags;
+
+float uid2name_dialog;