X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qh;h=9ba57f1931a33f0c1bf8d911ce0c7db80d6780b4;hb=bba2475e3a8b84e359ffae9b530d651f4d63e99a;hp=e288bebfcb27ad10248c46fdd8ec2acbb22f1ecd;hpb=d44927502027bfa3ccd6ccc98d9b7d6285c182c3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index e288bebfc..9ba57f193 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -1,9 +1,61 @@ #pragma once #include "utils.qh" +#include +//#include #include #include +bool autocvar__notarget; +int autocvar_g_balance_armor_start; +float autocvar_g_balance_pause_armor_rot_spawn; +float autocvar_g_balance_pause_fuel_rot_spawn; +float autocvar_g_balance_pause_health_regen_spawn; +float autocvar_g_balance_pause_health_rot_spawn; +bool autocvar_g_botclip_collisions; +bool autocvar_g_fullbrightplayers; +bool autocvar_g_playerclip_collisions; +float autocvar_g_player_alpha; +float autocvar_g_player_brightness; +float autocvar_g_player_damageforcescale = 2; +float autocvar_g_respawn_delay_small; +int autocvar_g_respawn_delay_small_count; +float autocvar_g_respawn_delay_large; +int autocvar_g_respawn_delay_large_count; +float autocvar_g_respawn_delay_max; +bool autocvar_g_respawn_delay_forced; +bool autocvar_g_respawn_ghosts; +float autocvar_g_respawn_ghosts_alpha = 1; +float autocvar_g_respawn_ghosts_fadetime = 1.5; +float autocvar_g_respawn_ghosts_time = 4.5; +float autocvar_g_respawn_ghosts_speed; +int autocvar_g_respawn_waves; +bool autocvar_g_nodepthtestplayers; +string autocvar_g_mutatormsg; +float autocvar_sv_foginterval; +float autocvar_sv_maxidle; +int autocvar_sv_maxidle_minplayers = 2; +float autocvar_sv_maxidle_playertospectator = 60; +bool autocvar_sv_maxidle_alsokickspectators; +int autocvar_sv_maxidle_slots; +bool autocvar_sv_maxidle_slots_countbots; +bool autocvar_g_forced_respawn; +int autocvar_g_maxplayers; +float autocvar_g_maxplayers_spectator_blocktime; +string autocvar_g_xonoticversion; +float autocvar_gameversion; +float autocvar_gameversion_min; +float autocvar_gameversion_max; +string autocvar_hostname; +int autocvar_spawn_debug; +string autocvar_sv_motd; +int autocvar_sv_name_maxlength = 64; +bool autocvar_sv_servermodelsonly; +int autocvar_sv_spectate; +bool autocvar_sv_teamnagger; +float autocvar_sv_player_scale; +bool autocvar_sv_showspectators; + // WEAPONTODO .string weaponorder_byimpulse; @@ -12,7 +64,6 @@ .float jointime; // time of connecting .float startplaytime; // time of switching from spectator to player .float alivetime; // time of being alive -.float motd_actived_time; // used for both motd and campaign_message .bool wasplayer; @@ -107,7 +158,6 @@ CLASS(Client, Object) ATTRIB(Client, teamkill_soundtime, float, this.teamkill_soundtime); ATTRIB(Client, teamkill_soundsource, entity, this.teamkill_soundsource); ATTRIB(Client, usekeypressed, bool, this.usekeypressed); - ATTRIB(Client, motd_actived_time, float, this.motd_actived_time); ATTRIB(Client, jointime, float, this.jointime); ATTRIB(Client, spectatortime, float, this.spectatortime); ATTRIB(Client, startplaytime, float, this.startplaytime); @@ -123,7 +173,6 @@ CLASS(Client, Object) ATTRIB(Client, zoomstate, bool, this.zoomstate); ATTRIB(Client, just_joined, bool, this.just_joined); ATTRIB(Client, race_completed, bool, this.race_completed); - ATTRIBARRAY(Client, msg_choice_choices, int, 20); // TODO: actually NOTIF_CHOICE_MAX ATTRIB(Client, latency_sum, float, this.latency_sum); ATTRIB(Client, latency_cnt, int, this.latency_cnt); ATTRIB(Client, latency_time, float, this.latency_time); @@ -143,6 +192,9 @@ CLASS(Client, Object) // networked cvars +// not currently handled by ClientState +#if 0 + ATTRIBARRAY(Client, msg_choice_choices, int, 20); // TODO: actually NOTIF_CHOICE_MAX ATTRIB(Client, cvar_cl_allow_uid2name, int, this.cvar_cl_allow_uid2name); ATTRIB(Client, cvar_cl_allow_uidtracking, int, this.cvar_cl_allow_uidtracking); ATTRIB(Client, cvar_cl_autotaunt, float, this.cvar_cl_autotaunt); @@ -158,13 +210,13 @@ CLASS(Client, Object) ATTRIB(Client, cvar_cl_clippedspectating, bool, this.cvar_cl_clippedspectating); ATTRIB(Client, cvar_cl_autoscreenshot, int, this.cvar_cl_autoscreenshot); ATTRIB(Client, cvar_cl_jetpack_jump, bool, this.cvar_cl_jetpack_jump); - ATTRIB(Client, cvar_cl_newusekeysupported, bool, this.cvar_cl_newusekeysupported); ATTRIB(Client, cvar_cl_noantilag, bool, this.cvar_cl_noantilag); ATTRIB(Client, cvar_cl_movement_track_canjump, bool, this.cvar_cl_movement_track_canjump); ATTRIB(Client, cvar_cl_weaponimpulsemode, int, this.cvar_cl_weaponimpulsemode); ATTRIB(Client, cvar_g_xonoticversion, string, this.cvar_g_xonoticversion); - ATTRIB(Client, autoswitch, bool, this.autoswitch); + ATTRIB(Client, cvar_cl_autoswitch, bool, this.cvar_cl_autoswitch); ATTRIB(Client, cvar_cl_casings, bool, this.cvar_cl_casings); + ATTRIB(Client, cvar_r_drawviewmodel, bool, this.cvar_r_drawviewmodel); ATTRIB(Client, cvar_cl_dodging_timeout, float, this.cvar_cl_dodging_timeout); ATTRIB(Client, cvar_cl_dodging, float, this.cvar_cl_dodging); ATTRIB(Client, cvar_cl_multijump, bool, this.cvar_cl_multijump); @@ -175,6 +227,7 @@ CLASS(Client, Object) ATTRIB(Client, cvar_cl_cts_noautoswitch, bool, this.cvar_cl_cts_noautoswitch); ATTRIB(Client, cvar_cl_weapon_switch_reload, bool, this.cvar_cl_weapon_switch_reload); ATTRIB(Client, cvar_cl_weapon_switch_fallback_to_impulse, bool, this.cvar_cl_weapon_switch_fallback_to_impulse); +#endif METHOD(Client, m_unwind, bool(Client this)); @@ -221,9 +274,6 @@ CLASS(Player, Client) ATTRIB(Player, dual_weapons, vector, this.dual_weapons); // TODO: actually WepSet! ATTRIB(Player, itemkeys, int, this.itemkeys); ATTRIB(Player, ballistics_density, float, this.ballistics_density); - ATTRIB(Player, prevstrengthsound, float, this.prevstrengthsound); - ATTRIB(Player, prevstrengthsoundattempt, float, this.prevstrengthsoundattempt); - ATTRIB(Player, buff_shield, float, this.buff_shield); INIT(Player) { this.classname = STR_PLAYER; @@ -267,11 +317,8 @@ bool independent_players; //flood fields .float nickspamtime; // time of last nick change .float nickspamcount; -.float floodcontrol_chat; -.float floodcontrol_chatteam; -.float floodcontrol_chattell; -.float floodcontrol_voice; -.float floodcontrol_voiceteam; + +void SendWelcomeMessage(entity this, int msg_type); // respawning .int respawn_flags; @@ -297,12 +344,6 @@ const int SVC_SETVIEW = 5; // TODO: move to dpdefs where this belongs! .float pauserotarmor_finished; .float pauserotfuel_finished; -// idle kicking -float sv_maxidle; -float sv_maxidle_spectatorsareidle; -int sv_maxidle_slots; -bool sv_maxidle_slots_countbots; - // g__str: // If 0, default is used. // If <0, 0 is used. @@ -322,10 +363,6 @@ void ClientData_Touch(entity e); int nJoinAllowed(entity this, entity ignore); -void FixIntermissionClient(entity e); - -void checkSpectatorBlock(entity this); - void PlayerUseKey(entity this); void FixClientCvars(entity e); @@ -336,46 +373,19 @@ void FixClientCvars(entity e); IntrusiveList g_initforplayer; STATIC_INIT(g_initforplayer) { g_initforplayer = IL_NEW(); } -/// \brief Print the string to the client's chat. -/// \param[in] client Client to print to. -/// \param[in] text Text to print. -void PrintToChat(entity client, string text); - -/// \brief Print the string to the client's chat if the server cvar "developer" -/// is not 0. -/// \param[in] client Client to print to. -/// \param[in] text Text to print. -void DebugPrintToChat(entity client, string text); - -/// \brief Prints the string to all clients' chat. -/// \param[in] text Text to print. -void PrintToChatAll(string text); - -/// \brief Prints the string to all clients' chat if the server cvar "developer" -/// is not 0. -/// \param[in] text Text to print. -void DebugPrintToChatAll(string text); - -/// \brief Print the string to chat of all clients of the specified team. -/// \param[in] team_num Team to print to. See NUM_TEAM constants. -/// \param[in] text Text to print. -void PrintToChatTeam(int team_num, string text); - -/// \brief Print the string to chat of all clients of the specified team if the -/// server cvar "developer" is not 0. -/// \param[in] team_num Team to print to. See NUM_TEAM constants. -/// \param[in] text Text to print. -void DebugPrintToChatTeam(int team_num, string text); - void play_countdown(entity this, float finished, Sound samp); +void player_powerups_remove_all(entity this); -void RotRegen(entity this, float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit_mod); +// NOTE: current type is Resource (avoiding circular includes!) +void RotRegen(entity this, entity current, float limit_mod, + float regenstable, float regenfactor, float regenlinear, float regenframetime, + float rotstable, float rotfactor, float rotlinear, float rotframetime); bool Spectate(entity this, entity pl); void ClientInit_Spawn(); -void PutObserverInServer(entity this); +void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint); void SetSpectatee(entity this, entity spectatee); void SetSpectatee_status(entity this, int spectatee_num); @@ -393,6 +403,4 @@ void Join(entity this); #define SPECTATE_COPY() ACCUMULATE void SpectateCopy(entity this, entity spectatee) #define SPECTATE_COPYFIELD(fld) SPECTATE_COPY() { this.(fld) = spectatee.(fld); } -int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodcontrol); - const int MAX_SPECTATORS = 7;