X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fdefs.qh;h=e62f0704f16119b2236c847d90abeba704347da5;hp=82c43e2e27a0be796c16d9e008312715d3be540b;hb=9f5050e0bb2ac3f17572fac6f98eded6c037b058;hpb=4dd3c23aa51dd6fe855d8c5d97126a12a372eb3b diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index 82c43e2e2..5204e8f36 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -1,12 +1,11 @@ -#ifndef DEFS_H -#define DEFS_H +#pragma once // Additional OPTIONAL Fields and Globals //float intermission; float scoreboard_showscores; float scoreboard_showaccuracy; .string message; -.int renderflags; +.float renderflags; // float coop; // float deathmatch; @@ -17,18 +16,17 @@ float dmg_take; // Darkplaces Render Modifications #if 0 .float alpha; -.float renderflags; .vector colormod; .float scale; #endif // Basic variables -.float enttype; // entity type sent from server -.int sv_entnum; // entity number sent from server +.int enttype; // entity type sent from server +.int sv_entnum; // entity number sent from server .int team; .int team_size; -float vid_conwidth, vid_conheight; +float vid_conheight; int binddb; // QUALIFYING @@ -37,9 +35,11 @@ float race_time; float race_laptime; float race_checkpointtime; float race_previousbesttime; +float race_mypreviousbesttime; string race_previousbestname; float race_nextcheckpoint; float race_nextbesttime; +float race_mybesttime; string race_nextbestname; float race_penaltyaccumulator; // qualifying: total penalty time in tenths float race_penaltyeventtime; // time when the player got the penalty @@ -48,8 +48,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; @@ -71,7 +73,11 @@ float race_myrank; float nb_pb_period; // Spectating +// -1 - observing +// 0 - playing +// >0 - id of spectated player float spectatee_status; +float spectatee_status_changed_time; // short mapname string shortmapname; @@ -87,7 +93,7 @@ vector lightning_shotorigin[4]; float blurtest_time0, blurtest_time1, blurtest_radius, blurtest_power; #endif -float servertime, serverprevtime, serverdeltatime; +float serverprevtime, serverdeltatime; float ticrate; @@ -95,11 +101,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; - -// only for Porto -float angles_held_status; -vector angles_held; +.void(entity this, float thisdmg, int hittype, vector org, vector thisforce) event_damage; // weapons .bool silent; @@ -108,13 +110,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; @@ -126,9 +121,8 @@ int serverflags; float uid2name_dialog; -.bool csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead +float intermission_time; -#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1) +.bool csqcmodel_isdead; // used by shownames and miscfunctions (entcs_IsDead) to know when a player is dead -float g_balance_porto_secondary; -#endif +#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)