X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FDefs.qc;h=604bfef524eb20691c7d62ac399d39936990204a;hb=288a95f54dc6763f03136adfdf22fbf244ce9301;hp=b89a177f043a465c99c5fc7812a8b0d1eb83f3c3;hpb=30e9db455abe691a3560555a989beb382b3b2531;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc
index b89a177f0..604bfef52 100644
--- a/qcsrc/client/Defs.qc
+++ b/qcsrc/client/Defs.qc
@@ -116,7 +116,7 @@ void		end_sys_globals;		// flag for structure dumping
 .string		model;
 .float		frame;
 .float		skin;
-.float		effects;
+.int		effects;
 
 .vector		mins, maxs;		// bounding box extents reletive to origin
 .vector		size;			// maxs - mins
@@ -134,9 +134,9 @@ void		end_sys_globals;		// flag for structure dumping
 
 .entity 	enemy;
 
-.float		flags;
+.int		flags;
 
-.float		colormap;
+.int		colormap;
 
 .entity		owner;		// who launched a missile
 
@@ -149,7 +149,7 @@ float		intermission;
 float		scoreboard_showscores;
 float		scoreboard_showaccuracy;
 .string		message;
-.float renderflags;
+.int		renderflags;
 // float		coop;
 // float		deathmatch;
 
@@ -167,7 +167,7 @@ float		dmg_take;
 
 // Basic variables
 .float enttype; // entity type sent from server
-.float sv_entnum; // entity number sent from server
+.int   sv_entnum; // entity number sent from server
 .float team;
 .float team_size;
 
@@ -223,8 +223,8 @@ string shortmapname;
 float tempdb;
 float ClientProgsDB;
 vector hook_shotorigin[4];
-vector electro_shotorigin[4];
-vector gauntlet_shotorigin[4];
+vector lightning_shotorigin[4];
+
 
 #ifdef BLURTEST
 float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power;
@@ -235,8 +235,8 @@ float servertime, serverprevtime, serverdeltatime;
 float ticrate;
 
 .float damageforcescale;
-#define MIN_DAMAGEEXTRARADIUS 2
-#define MAX_DAMAGEEXTRARADIUS 16
+const float MIN_DAMAGEEXTRARADIUS = 2;
+const float MAX_DAMAGEEXTRARADIUS = 16;
 .float damageextraradius;
 .void(float thisdmg, float hittype, vector org, vector thisforce) event_damage;
 
@@ -247,11 +247,12 @@ vector angles_held;
 // weapons
 .float silent;
 
-float w_deathtype, w_issilent, w_random;
+int w_deathtype;
+float w_issilent, w_random;
 vector w_org, w_backoff;
 
 float rifle_scope;
-float nex_scope;
+float vortex_scope;
 
 float minelayer_maxmines;
 
@@ -262,9 +263,9 @@ float bgmtime;
 string weaponorder_byimpulse;
 string weaponorder_bypriority;
 
-float nex_charge_movingavg;
+float vortex_charge_movingavg;
 
-float serverflags;
+int serverflags;
 
 float uid2name_dialog;