X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=02f0849f067ec42e366d35710f6d04e4727c109e;hb=6549351d5a5f2307e603f69f8f23528d6a8baeb3;hp=a6374e46d8ee3e85f3f5f7c09a9aadc2ee86c87a;hpb=ea15a3c114674096d403c887e5debef4290071c6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index a6374e46d..e42dfe086 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -2,16 +2,17 @@ float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions -#define BUTTON_ATCK button0 -#define BUTTON_JUMP button2 -#define BUTTON_ATCK2 button3 -#define BUTTON_ZOOM button4 -#define BUTTON_CROUCH button5 -#define BUTTON_HOOK button6 -#define BUTTON_INFO button7 -#define BUTTON_CHAT buttonchat -#define BUTTON_USE buttonuse -#define BUTTON_DRAG button8 +#define BUTTON_ATCK button0 +#define BUTTON_JUMP button2 +#define BUTTON_ATCK2 button3 +#define BUTTON_ZOOM button4 +#define BUTTON_CROUCH button5 +#define BUTTON_HOOK button6 +#define BUTTON_INFO button7 +#define BUTTON_CHAT buttonchat +#define BUTTON_USE buttonuse +#define BUTTON_DRAG button8 +#define BUTTON_ZOOMSCRIPT button9 // Globals @@ -77,14 +78,13 @@ float maxclients; //.float style; //.float skill; .float sounds; +.float platmovetype; .string killtarget; .vector pos1, pos2; .vector mangle; -.float cvar_cl_hitsound; - .float pain_finished; //Added by Supajoe .float pain_frame; //" .float statdraintime; // record the one-second intervals between draining health and armour when they're over 100 @@ -148,6 +148,8 @@ float maxclients; .vector anim_forwardleft; // player running forward and left .vector anim_backright; // player running backward and right .vector anim_backleft; // player running back and left +.vector anim_melee; // player doing the melee action +.vector anim_fly; // player animation played after jump, if player is still in air. Also if falling from a ledge // weapon animation vectors: .vector anim_fire1; @@ -209,6 +211,7 @@ void w_clear(); void w_ready(); // VorteX: standalone think for weapons, so normal think on weaponentity can be reserved by weaponflashes (which needs update even player dies) .float weapon_nextthink; +.float weapon_forbidchange; .void() weapon_think; //float PLAYER_WEAPONSELECTION_DELAY = ); @@ -229,7 +232,6 @@ void weapon_defaultspawnfunc(float wpn); string w_deathtypestring; -void(entity client, string s) centerprint_builtin = #73; .vector dest1, dest2; float gameover; @@ -241,7 +243,6 @@ float alreadychangedlevel; .float runes; -.float welcomemessage_time; .float version; // minstagib vars @@ -267,7 +268,7 @@ void checkSpectatorBlock(); .float jointime; // time of joining .float alivetime; // time of being alive -float isJoinAllowed(); +float nJoinAllowed(float includeMe); #define PREVENT_JOIN_TEXT "^1You may not join the game at this time.\n\nThe player limit reached maximum capacity." //sv_timeout: pauses the game by setting the gamespeed to a really low value (see TIMEOUT_SLOWMO_VALUE) @@ -284,7 +285,6 @@ entity timeoutHandler; //responsible for centerprinting the timeout countdowns a void timeoutHandler_Think(); void evaluateTimeout(); void evaluateTimein(); -string getTimeoutText(float addOneSecond); .float spawnshieldtime; @@ -310,8 +310,6 @@ float default_weapon_alpha; .float() customizeentityforclient; .float cvar_cl_handicap; .float cvar_cl_playerdetailreduction; -.float cvar_scr_centertime; -.float cvar_cl_shownames; .string cvar_g_xonoticversion; .string cvar_cl_weaponpriority; .string cvar_cl_weaponpriorities[10]; @@ -328,6 +326,7 @@ float sv_loddistance2; .string weaponorder_byimpulse; .float cvar_cl_allow_uid2name; +.float cvar_cl_allow_uidtracking; .string stored_netname; void Announce(string snd); @@ -346,7 +345,6 @@ void AnnounceTo(entity e, string snd); .entity jumppadsused[NUM_JUMPPADSUSED]; string gamemode_name; -float teams_matter; float startitem_failed; @@ -362,24 +360,11 @@ float W_AmmoItemCode(float wpn); float W_WeaponBit(float wpn); string W_Name(float weaponid); -void UpdateSelectedPlayer(); -void ClearSelectedPlayer(); -.entity selected_player; -.entity last_selected_player; -.float selected_player_time; // when this player has been selected -.float selected_player_count; // how long this player has been directly pointed to -.float selected_player_display_needs_update; // are regular updates necessary? (health) -.float selected_player_display_timeout; // when the selection will time out - void FixIntermissionClient(entity e); void FixClientCvars(entity e); float weaponsInMap; -void centerprint_atprio(entity e, float prio, string s); -void centerprint_expire(entity e, float prio); -void centerprint(entity e, string s); - .float respawn_countdown; // next number to count float bot_waypoints_for_items; @@ -400,10 +385,6 @@ float assault_attacker_team; .float speedrunning; // Q3 support -.float notteam; -.float notsingle; -.float notfree; -.float notq3a; float q3acompat_machineshotgunswap; // database @@ -414,6 +395,7 @@ float TemporaryDB; float some_spawn_has_been_used; float have_team_spawns; // 0 = no team spawns requested, -1 = team spawns requested but none found, 1 = team spawns requested and found +float have_team_spawns_forteam[17]; // 0 = this team has no spawns, 1 = this team has spawns; team 0 is the "no-team" // set when showing a kill countdown .entity killindicator; @@ -440,18 +422,26 @@ float next_pingtime; // TODO implemented fall and falling #define ALLPLAYERSOUNDS \ _VOICEMSG(death) \ - _VOICEMSG(fall) \ _VOICEMSG(drown) \ + _VOICEMSG(fall) \ + _VOICEMSG(fall) \ + _VOICEMSG(falling) \ _VOICEMSG(gasp) \ _VOICEMSG(jump) \ + _VOICEMSG(pain100) \ _VOICEMSG(pain25) \ _VOICEMSG(pain50) \ - _VOICEMSG(pain75) \ - _VOICEMSG(pain100) + _VOICEMSG(pain75) + #define ALLVOICEMSGS \ _VOICEMSG(attack) \ _VOICEMSG(attackinfive) \ + _VOICEMSG(coverme) \ + _VOICEMSG(defend) \ + _VOICEMSG(freelance) \ + _VOICEMSG(incoming) \ _VOICEMSG(meet) \ + _VOICEMSG(needhelp) \ _VOICEMSG(seenflag) \ _VOICEMSG(taunt) \ _VOICEMSG(teamshoot) @@ -461,24 +451,18 @@ ALLPLAYERSOUNDS ALLVOICEMSGS #undef _VOICEMSG -// reserved sound names for the future (models lack sounds for them): +// reserved sound names for the future (some models lack sounds for them): +// _VOICEMSG(flagcarriertakingdamage) \ +// _VOICEMSG(getflag) \ +// reserved sound names for the future (ALL models lack sounds for them): // _VOICEMSG(affirmative) \ // _VOICEMSG(attacking) \ // _VOICEMSG(defending) \ // _VOICEMSG(roaming) \ // _VOICEMSG(onmyway) \ // _VOICEMSG(droppedflag) \ -// _VOICEMSG(flagcarriertakingdamage) \ // _VOICEMSG(negative) \ // _VOICEMSG(seenenemy) \ -// _VOICEMSG(fall) \ -// _VOICEMSG(getflag) \ -// _VOICEMSG(incoming) \ -// _VOICEMSG(coverme) \ -// _VOICEMSG(needhelp) \ -// _VOICEMSG(defend) \ -// _VOICEMSG(freelance) \ -// _VOICEMSG(falling) \ string globalsound_fall; string globalsound_metalfall; @@ -555,6 +539,7 @@ void target_voicescript_clear(entity pl); .string target2; .string target3; .string target4; +.float target_random; .float trigger_reverse; // Nexball @@ -572,10 +557,6 @@ void ClientData_Touch(entity e); vector debug_shotorg; // if non-zero, overrides the shot origin of all weapons -// the QC VM sucks -#define BITXOR(v,b) ((v) + (b) - 2 * ((v) & (b))) -#define BITXOR_ASSIGN(v,b) ((v) += ((b) - 2 * ((v) & (b)))) - .float wasplayer; float servertime, serverprevtime, serverframetime; @@ -603,6 +584,9 @@ string matchid; .float last_pickup; +.float hit_time; +.float typehit_time; + .float stat_leadlimit; float radar_showennemies; @@ -612,9 +596,14 @@ float client_cefc_accumulator; float client_cefc_accumulatortime; #endif -.float ammo_counter; -.float old_ammo_counter; -.float wish_reload; +..float current_ammo; + +.float weapon_load[WEP_MAXCOUNT]; +.float ammo_none; // used by the reloading system, must always be 0 +.float clip_load; +.float old_clip_load; +.float clip_size; +.float minelayer_mines; #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE // when doing this, hagar can go through clones @@ -653,6 +642,8 @@ string deathmessage; .float nex_charge_rottime; .float nex_chargepool_ammo; +.float hagar_load; + float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended) float serverflags; @@ -664,3 +655,5 @@ float serverflags; .entity muzzle_flash; .float misc_bulletcounter; // replaces uzi & hlac bullet counter. + +void PlayerUseKey();