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=b13583f6f514785ce4a3f2e28076ad07e00ca50b;hb=9f5050e0bb2ac3f17572fac6f98eded6c037b058;hpb=ef5d72bcd06c2c1380e63fe900aafbca20153d02 diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index b13583f6f..5204e8f36 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -1,158 +1,11 @@ -#ifndef DEFS_H -#define DEFS_H - -//NOTE: THIS IS AN INTERFACE FILE. DO NOT EDIT. -//MODIFYING THIS FILE CAN RESULT IN CRC ERRORS. -//YOU HAVE BEEN WARNED. - -//feel free to look though. :) - - - - - -/* -============================================================================== - - SOURCE FOR GLOBALVARS_T C STRUCTURE - -============================================================================== -*/ - -// -// system globals -// -//entity self; -//entity other; -//entity world; -//float time; -//float frametime; - -//int player_localentnum; //the entnum of the VIEW entity -//int player_localnum; //the playernum -//float maxclients; //a constant filled in by the engine. gah, portability eh? - -//float clientcommandframe; //player movement -//float servercommandframe; //clientframe echoed off the server - -//string mapname; - -// -// global variables set by built in functions -// -//vector v_forward, v_up, v_right; // set by makevectors() - -// set by traceline / tracebox -//float trace_allsolid; -//float trace_startsolid; -//float trace_fraction; -//vector trace_endpos; -//vector trace_plane_normal; -//float trace_plane_dist; -//entity trace_ent; -//float trace_inopen; -//float trace_inwater; - -// -// required prog functions -// -void() CSQC_Init; -void() CSQC_Shutdown; -float(float f, float t, float n) CSQC_InputEvent; -void(float w, float h) CSQC_UpdateView; -bool(string s) CSQC_ConsoleCommand; - -//these fields are read and set by the default player physics -//vector pmove_org; -//vector pmove_vel; -//vector pmove_mins; -//vector pmove_maxs; -//retrieved from the current movement commands (read by player physics) -//float input_timelength; -//vector input_angles; -//vector input_movevalues; //forwards, right, up. -//int input_buttons; //attack, use, jump (default physics only uses jump) - -//float movevar_gravity; -//float movevar_stopspeed; -//float movevar_maxspeed; -//float movevar_spectatormaxspeed; //used by NOCLIP movetypes. -//float movevar_accelerate; -//float movevar_airaccelerate; -//float movevar_wateraccelerate; -//float movevar_friction; -//float movevar_waterfriction; -//float movevar_entgravity; //the local player's gravity field. Is a multiple (1 is the normal value) - -//================================================ -//void end_sys_globals; // flag for structure dumping -//================================================ - -/* -============================================================================== - - SOURCE FOR ENTVARS_T C STRUCTURE - -============================================================================== -*/ - -// -// system fields (*** = do not set in prog code, maintained by C code) -// -.int modelindex; // *** model index in the precached list -.vector absmin, absmax; // *** origin + mins / maxs - -.int entnum; // *** the ent number as on the server -.float drawmask; -.void() predraw; - -.float movetype; -.float solid; - -.vector origin; // *** -.vector oldorigin; // *** -.vector velocity; -.vector angles; -.vector avelocity; - -.string classname; // spawn function -.string model; -.int frame; -.int skin; -.int effects; - -.vector mins, maxs; // bounding box extents reletive to origin -.vector size; // maxs - mins - -.void() touch; -.void() use; -.void() think; -.void() blocked; // for doors or plats, called when can't push other - -.float nextthink; - -.entity chain; - -.string netname; - -.entity enemy; - -.int flags; - -.int colormap; - -.entity owner; // who launched a missile - -//================================================ -//void end_sys_fields; // flag for structure dumping -//================================================ +#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; @@ -163,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 @@ -183,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 @@ -194,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; @@ -217,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; @@ -233,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; @@ -241,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; @@ -254,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; @@ -272,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 \ No newline at end of file +#define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1)