Merge remote branch 'origin/fruitiex/fruitbalance'

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

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index 14f9301b094497fbf5fb80480e433c463d8e3b81..4e5380f33239755ecf51b85de28c4a73627c30bd 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -149,9 +149,8 @@ void                end_sys_fields;                 // flag for structure dumping
 
 // Additional OPTIONAL Fields and Globals
 float          intermission;
-float          sb_showscores;
-float          sb_showaccuracy;
-float          hud_currentammo;
+float          scoreboard_showscores;
+float          scoreboard_showaccuracy;
 .string                message;
 .float renderflags;
 // float               coop;
@@ -212,7 +211,7 @@ float race_othercheckpointtime;
 float race_othercheckpointdelta;
 float race_othercheckpointlapsdelta;
 string race_othercheckpointenemy;
-float sb_showscores_force;
+float scoreboard_showscores_force;
 float race_status;
 string race_status_name;
 float race_myrank;
@@ -233,7 +232,9 @@ float announcer_5min;
 // database for misc stuff
 float tempdb;
 float ClientProgsDB;
-vector hook_shotorigin;
+vector hook_shotorigin[4];
+vector electro_shotorigin[4];
+vector gauntlet_shotorigin[4];
 
 #ifdef BLURTEST
 float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power;
@@ -249,3 +250,18 @@ float ticrate;
 // only for Porto
 float angles_held_status;
 vector angles_held;
+
+// weapons
+.float silent;
+
+float w_deathtype, w_issilent, w_random;
+string w_deathtypestring;
+vector w_org, w_backoff;
+
+float campingrifle_scope;
+float nex_scope;
+
+float nex_minvelocity;
+float nex_maxvelocity;
+
+float cr_maxbullets;