X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qh;h=42d7d9560b4e92359242e19428f242d146cbff0a;hp=30451313202097f54e0891541b87f7ad46c6cb24;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=e435344ae1d6288dde08dc931f1e1b48547218ce;ds=sidebyside diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index 304513132..42d7d9560 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -1,5 +1,8 @@ #pragma once +#include "utils.qh" +#include + void ClientState_attach(entity this); IntrusiveList g_players; @@ -70,7 +73,6 @@ CLASS(Client, Object) ATTRIB(Client, parm_idlesince, int, this.parm_idlesince); ATTRIB(Client, muted, bool, this.muted); - ATTRIB(Client, killindicator_teamchange, int, this.killindicator_teamchange); ATTRIB(Client, idlekick_lasttimeleft, float, this.idlekick_lasttimeleft); ATTRIB(Client, pm_frametime, float, this.pm_frametime); ATTRIB(Client, pressedkeys, int, this.pressedkeys); @@ -83,6 +85,7 @@ CLASS(Client, Object) 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); ATTRIB(Client, version_nagtime, float, this.version_nagtime); ATTRIB(Client, netname_previous, string, this.netname_previous); ATTRIB(Client, allowed_timeouts, int, this.allowed_timeouts); @@ -90,6 +93,56 @@ CLASS(Client, Object) ATTRIB(Client, taunt_soundtime, float, this.taunt_soundtime); ATTRIB(Client, killcount, int, this.killcount); ATTRIB(Client, version_mismatch, bool, this.version_mismatch); + ATTRIB(Client, version, int, this.version); + ATTRIB(Client, spectatee_status, int, this.spectatee_status); + 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, 50); // 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); + ATTRIB(Client, v_angle_old, vector, this.v_angle_old); + ATTRIB(Client, model_randomizer, float, this.model_randomizer); + ATTRIB(Client, accuracy, entity, this.accuracy); + ATTRIB(Client, hasweapon_complain_spam, float, this.hasweapon_complain_spam); + ATTRIB(Client, scorekeeper, entity, this.scorekeeper); + ATTRIB(Client, specialcommand_pos, int, this.specialcommand_pos); + ATTRIB(Client, hitplotfh, int, this.hitplotfh); + ATTRIB(Client, clientdata, entity, this.clientdata); + ATTRIB(Client, cmd_floodcount, int, this.cmd_floodcount); + ATTRIB(Client, cmd_floodtime, float, this.cmd_floodtime); + ATTRIB(Client, wasplayer, bool, this.wasplayer); + + // networked cvars + + 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); + ATTRIB(Client, cvar_cl_voice_directional, int, this.cvar_cl_voice_directional); + ATTRIB(Client, cvar_cl_voice_directional_taunt_attenuation, float, this.cvar_cl_voice_directional_taunt_attenuation); + ATTRIB(Client, cvar_cl_physics, string, this.cvar_cl_physics); + ATTRIB(Client, cvar_cl_buffs_autoreplace, bool, this.cvar_cl_buffs_autoreplace); + ATTRIB(Client, cvar_cl_nade_type, int, this.cvar_cl_nade_type); + ATTRIB(Client, cvar_cl_pokenade_type, string, this.cvar_cl_pokenade_type); + ATTRIB(Client, cvar_cl_spawn_near_teammate, bool, this.cvar_cl_spawn_near_teammate); + ATTRIB(Client, cvar_cl_gunalign, int, this.cvar_cl_gunalign); + ATTRIB(Client, cvar_cl_handicap, float, this.cvar_cl_handicap); + 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_dodging_timeout, float, this.cvar_cl_dodging_timeout); + ATTRIB(Client, cvar_cl_multijump, bool, this.cvar_cl_multijump); + ATTRIB(Client, cvar_cl_accuracy_data_share, bool, this.cvar_cl_accuracy_data_share); + ATTRIB(Client, cvar_cl_accuracy_data_receive, bool, this.cvar_cl_accuracy_data_receive); + ATTRIBARRAY(Client, cvar_cl_weaponpriorities, string, 10); + ATTRIB(Client, cvar_cl_weaponpriority, string, this.cvar_cl_weaponpriority); METHOD(Client, m_unwind, bool(Client this)); @@ -130,6 +183,16 @@ CLASS(Spectator, Client) ENDCLASS(Spectator) CLASS(Player, Client) + + // custom + + 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; IL_PUSH(g_players, this); @@ -161,8 +224,6 @@ METHOD(Client, m_unwind, bool(Client this)) return false; } -float c1, c2, c3, c4; - void play_countdown(entity this, float finished, Sound samp); float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit);