X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=2e8ba3d698064524db892edbc3145e981e3fc889;hb=8b2a456d83da008b5d17ec6092716a20718c0798;hp=d7179fafebb703f9c8b2d38ebd426d25cb2a3014;hpb=611c9e4ecde2bef434f19cd60e279f4151579586;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index d7179fafeb..2e8ba3d698 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 @@ -147,6 +148,7 @@ 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 // weapon animation vectors: .vector anim_fire1; @@ -208,6 +210,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 = ); @@ -310,7 +313,6 @@ float default_weapon_alpha; .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]; @@ -346,7 +348,6 @@ void AnnounceTo(entity e, string snd); .entity jumppadsused[NUM_JUMPPADSUSED]; string gamemode_name; -float teams_matter; float startitem_failed; @@ -362,15 +363,6 @@ 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); @@ -410,7 +402,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_noteam_spawns; // 0 = no no-team spawns, 1 = no-team spawns exist +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; @@ -437,18 +429,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) @@ -458,24 +458,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; @@ -552,6 +546,7 @@ void target_voicescript_clear(entity pl); .string target2; .string target3; .string target4; +.float target_random; .float trigger_reverse; // Nexball @@ -569,10 +564,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; @@ -614,7 +605,7 @@ float client_cefc_accumulatortime; ..float current_ammo; -.float weapon_load[WEP_MAXCOUNT]; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(weapon_load); +.float weapon_load[WEP_MAXCOUNT]; .float ammo_none; // used by the reloading system, must always be 0 .float clip_load; .float old_clip_load; @@ -658,6 +649,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; @@ -669,3 +662,5 @@ float serverflags; .entity muzzle_flash; .float misc_bulletcounter; // replaces uzi & hlac bullet counter. + +void PlayerUseKey();