X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2FDefs.qc;h=24a5fbfc0beb4532ed32ead7da6f43187ea09aad;hb=8956fac358b1f67619049037f188cbffd6fe1b36;hp=e4519b2b3d93fef8061208aaf78ec95c1d2b1773;hpb=70dbd52151c76d8300738a163ed92768ad606b15;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc index e4519b2b3..24a5fbfc0 100644 --- a/qcsrc/client/Defs.qc +++ b/qcsrc/client/Defs.qc @@ -1,6 +1,3 @@ -#pragma flag off fastarrays // make dp behave with new fteqcc versions. remove when dp bug with fteqcc fastarrays is fixed - - //NOTE: THIS IS AN INTERFACE FILE. DO NOT EDIT. //MODIFYING THIS FILE CAN RESULT IN CRC ERRORS. //YOU HAVE BEEN WARNED. @@ -226,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; @@ -251,11 +248,10 @@ vector angles_held; .float silent; float w_deathtype, w_issilent, w_random; -string w_deathtypestring; vector w_org, w_backoff; float rifle_scope; -float nex_scope; +float vortex_scope; float minelayer_maxmines; @@ -266,10 +262,14 @@ float bgmtime; string weaponorder_byimpulse; string weaponorder_bypriority; -float nex_charge_movingavg; +float vortex_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 +.float csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead + +#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1) + +float g_balance_porto_secondary;