Merge branch 'master' into terencehill/arena_and_ca_fixes

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

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index 14f9301b094497fbf5fb80480e433c463d8e3b81..e4519b2b3d93fef8061208aaf78ec95c1d2b1773 100644 (file)
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -28,7 +28,7 @@ entity                world;
 float          time;
 float          frametime;
 
-float          player_localentnum;     //the entnum
+float          player_localentnum;     //the entnum of the VIEW entity
 float          player_localnum;        //the playernum
 float          maxclients;     //a constant filled in by the engine. gah, portability eh?
 
@@ -149,15 +149,14 @@ 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;
 // float               deathmatch;
 
-// float               dmg_take;
+float          dmg_take;
 // float               dmg_save;
 // vector              dmg_origin;
 
@@ -178,9 +177,6 @@ float               hud_currentammo;
 float vid_conwidth, vid_conheight;
 float binddb;
 
-//     Announcer
-string announce_snd;
-
 // QUALIFYING
 float race_checkpoint;
 float race_time;
@@ -212,7 +208,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;
@@ -226,14 +222,12 @@ float spectatee_status;
 // short mapname
 string shortmapname;
 
-//remaining maptime announcer sounds, true when sound was already played
-float announcer_1min;
-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;
@@ -244,8 +238,38 @@ float servertime, serverprevtime, serverdeltatime;
 float ticrate;
 
 .float damageforcescale;
+#define MIN_DAMAGEEXTRARADIUS 2
+#define MAX_DAMAGEEXTRARADIUS 16
+.float damageextraradius;
 .void(float thisdmg, float hittype, vector org, vector thisforce) event_damage;
 
 // 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 rifle_scope;
+float nex_scope;
+
+float minelayer_maxmines;
+
+float hagar_maxrockets;
+
+float bgmtime;
+
+string weaponorder_byimpulse;
+string weaponorder_bypriority;
+
+float nex_charge_movingavg;
+
+float serverflags;
+
+float uid2name_dialog;
+
+.float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead
\ No newline at end of file