X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fdefs.qh;h=e62f0704f16119b2236c847d90abeba704347da5;hb=b5d3bff7d8bc7969453a821b5d4d18460a6dd023;hp=069598e3b4613c457f86d0479fdba2a4077edb4c;hpb=2bb4c42f723576432bb2c80e0afe0a09ec7350f3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index 069598e3b..e62f0704f 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -1,5 +1,4 @@ -#ifndef CLIENT_DEFS_H -#define CLIENT_DEFS_H +#pragma once // Additional OPTIONAL Fields and Globals //float intermission; @@ -48,8 +47,10 @@ string race_penaltyreason; // reason for penalty float race_server_record; // server record float race_speedaward; string race_speedaward_holder; +string race_speedaward_unit; float race_speedaward_alltimebest; string race_speedaward_alltimebest_holder; +string race_speedaward_alltimebest_unit; // RACE float race_mycheckpoint; @@ -95,7 +96,7 @@ float ticrate; const float MIN_DAMAGEEXTRARADIUS = 2; const float MAX_DAMAGEEXTRARADIUS = 16; .float damageextraradius; -.void(float thisdmg, int hittype, vector org, vector thisforce) event_damage; +.void(entity this, float thisdmg, int hittype, vector org, vector thisforce) event_damage; // only for Porto float angles_held_status; @@ -108,13 +109,6 @@ int w_deathtype; float w_issilent, w_random; vector w_org, w_backoff; -float rifle_scope; -float vortex_scope; - -float minelayer_maxmines; - -float hagar_maxrockets; - float bgmtime; string weaponorder_byimpulse; @@ -129,6 +123,3 @@ float uid2name_dialog; .bool csqcmodel_isdead; // used by shownames and miscfunctions (entcs_IsDead) to know when a player is dead #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1) - -float g_balance_porto_secondary; -#endif