From: Rudolf Polzer Date: Mon, 22 Nov 2010 12:49:47 +0000 (+0100) Subject: beginning of a SANE accuracy networking system X-Git-Tag: xonotic-v0.1.0preview~109^2~8 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b144d9fe957abf5e1524c6b302b572dd9f7b28c;p=xonotic%2Fxonotic-data.pk3dir.git beginning of a SANE accuracy networking system --- diff --git a/qcsrc/server/accuracy.qc b/qcsrc/server/accuracy.qc new file mode 100644 index 000000000..4e86e7052 --- /dev/null +++ b/qcsrc/server/accuracy.qc @@ -0,0 +1,67 @@ +.entity accuracy; +.float accuracy_hit[WEP_MAXCOUNT]; +.float accuracy_fired[WEP_MAXCOUNT]; + +void accuracy_send(entity to, float sf) +{ + float w, f; + WriteByte(MSG_ENTITY, ENT_CLIENT_ACCURACY); + if(to != self.owner) + if not(self.owner.cvar_cl_accuracy_data_share && autocvar_sv_accuracy_data_share) + sf = 0; + // note: zero sendflags can never be sent... so we can use that to say that we send no accuracy! + WriteInt24_t(MSG_ENTITY, sf); + if(sf == 0) + return TRUE; + // note: we know that client and server agree about SendFlags... + for(w = 0, f = 1; w <= WEP_LAST - WEP_FIRST; ++w, f *= 2) + { + if(sf & f) + { + if(self.(accuracy_fired[w])) + WriteByte(MSG_ENTITY, 0); + else + WriteByte(MSG_ENTITY, 1 + bound(0, (254.0 * self.(accuracy_hit[w])) / self.(accuracy_fired[w]), 254)); + } + } + return TRUE; +} + +// init/free +void accuracy_init(entity e) +{ + e.accuracy = spawn(); + e.accuracy.owner = e; + e.accuracy.classname = "accuracy"; + e.accuracy.SendEntity = accuracy_send; +} + +void accuracy_free(entity e) +{ + remove(e.accuracy); +} + +// force a resend of a player's accuracy stats +void accuracy_resend(entity e) +{ + e.accuracy.SendFlags = 0xFFFFFF; +} + +// update accuracy stats +void accuracy_set(entity e, float w, float hit, float fired) +{ + e = e.accuracy; + w -= WEP_FIRST; + e.(accuracy_hit[w]) = hit; + e.(accuracy_fired[w]) = fired; + e.SendFlags |= pow(2, w); +} + +void accuracy_add(entity e, float w, float hit, float fired) +{ + e = e.accuracy; + w -= WEP_FIRST; + e.(accuracy_hit[w]) += hit; + e.(accuracy_fired[w]) += fired; + e.SendFlags |= pow(2, w); +} diff --git a/qcsrc/server/accuracy.qh b/qcsrc/server/accuracy.qh new file mode 100644 index 000000000..07257da48 --- /dev/null +++ b/qcsrc/server/accuracy.qh @@ -0,0 +1,13 @@ +.float cvar_cl_accuracy_data_share; +var float autocvar_sv_accuracy_data_share = 1; + +// init/free +void accuracy_init(entity e); +void accuracy_free(entity e); + +// force a resend of a player's accuracy stats +void accuracy_resend(entity e); + +// update accuracy stats +void accuracy_set(entity e, float w, float hit, float fired); +void accuracy_add(entity e, float w, float hit, float fired); diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index c2718d4e8..104f58c38 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -35,6 +35,7 @@ campaign.qh ../common/mapinfo.qh ../common/util.qc +accuracy.qh csqcprojectile.qh csqceffects.qc @@ -168,6 +169,7 @@ monsters/fight.qc monsters/ai.qc monsters/m_monsters.qc monsters/monster_zombie.qc +accuracy.qc csqcprojectile.qc playerdemo.qc