eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

mostly fix v_gunkick/punchangle in nq mods.

Browse source 
as an nq client, its still ignored.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4580 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-01-15 01:30:23 +00:00
parent d9085d414b
commit e00155b8fa
1 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
engine/server/sv_send.c
View file

@ -1253,12 +1253,50 @@ void SV_WriteClientdataToMessage (client_t *client, sizebuf_t *msg)
client->nextservertimeupdate = sv.physicstime; client->nextservertimeupdate = sv.physicstime;
*/ */
#ifdef NQPROT
if (ISQWCLIENT(client))
return;
ent = client->edict; ent = client->edict;
#ifdef NQPROT
if (progstype != PROG_QW)
{
if (ISQWCLIENT(client))
{
//quakeworld clients drop the punch angle themselves.
while (ent->xv->punchangle[0] < -3)
{
ent->xv->punchangle[0] += 4;
MSG_WriteByte (msg, svc_bigkick);
}
while (ent->xv->punchangle[0] < -1)
{
ent->xv->punchangle[0] += 2;
MSG_WriteByte (msg, svc_smallkick);
}
ent->xv->punchangle[1] = 0;
ent->xv->punchangle[2] = 0;
}
else
{
for (i = 0; i < 3; i++)
{
//nq clients require the server to do it (interpolating, if its a decent client).
if (ent->xv->punchangle[i] < 0)
{
ent->xv->punchangle[i] += 10 * (1/77.0);
if (ent->xv->punchangle[i] > 0)
ent->xv->punchangle[i] = 0;
}
if (ent->xv->punchangle[i] < 0)
{
ent->xv->punchangle[i] -= 10 * (1/77.0);
if (ent->xv->punchangle[i] < 0)
ent->xv->punchangle[i] = 0;
}
}
}
}
if (ISQWCLIENT(client))
return;
if (!(client->fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS)) if (!(client->fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS))
{ {
@ -1303,8 +1341,8 @@ void SV_WriteClientdataToMessage (client_t *client, sizebuf_t *msg)
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
{ {
// if (ent->v->punchangle[i]) if (ent->xv->punchangle[i])
// bits |= (SU_PUNCH1<<i); bits |= (SU_PUNCH1<<i);
if (ent->v->velocity[i]) if (ent->v->velocity[i])
bits |= (SU_VELOCITY1<<i); bits |= (SU_VELOCITY1<<i);
} }
@ -1377,8 +1415,13 @@ void SV_WriteClientdataToMessage (client_t *client, sizebuf_t *msg)
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
{ {
// if (bits & (SU_PUNCH1<<i)) if (bits & (SU_PUNCH1<<i))
// MSG_WriteChar (msg, ent->v->punchangle[i]); {
if (client->protocol == SCP_DARKPLACES6 || client->protocol == SCP_DARKPLACES7)
MSG_WriteAngle16 (msg, ent->xv->punchangle[i]);
else
MSG_WriteChar (msg, ent->xv->punchangle[i]);
}
if (bits & (SU_VELOCITY1<<i)) if (bits & (SU_VELOCITY1<<i))
{ {
if (client->protocol == SCP_DARKPLACES6 || client->protocol == SCP_DARKPLACES7) if (client->protocol == SCP_DARKPLACES6 || client->protocol == SCP_DARKPLACES7)