X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FDefs.qc;h=4e5380f33239755ecf51b85de28c4a73627c30bd;hb=d41484d9c5e2aa6c3ebb81356c1c65a4c54a4a2a;hp=fbed63fc40b671ffb09f0d43d11eb5a9eecf5bad;hpb=992529cda6e328df91113b580eae2f1b3ef0cdfd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index fbed63fc4..e4519b2b3 100644
--- 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?
 
@@ -156,7 +156,7 @@ float		scoreboard_showaccuracy;
 // float		coop;
 // float		deathmatch;
 
-// float		dmg_take;
+float		dmg_take;
 // float		dmg_save;
 // vector		dmg_origin;
 
@@ -177,9 +177,6 @@ float		scoreboard_showaccuracy;
 float vid_conwidth, vid_conheight;
 float binddb;
 
-//	Announcer
-string announce_snd;
-
 // QUALIFYING
 float race_checkpoint;
 float race_time;
@@ -225,10 +222,6 @@ 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;
@@ -245,6 +238,9 @@ 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
@@ -258,5 +254,22 @@ float w_deathtype, w_issilent, w_random;
 string w_deathtypestring;
 vector w_org, w_backoff;
 
-float campingrifle_scope;
+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