zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-29 02:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Add the q16ang and q16horiz fields to SW_PACKET. These

Browse source 
will be filled by faketimerhandler with the current player's
most recent camq16ang and camq16horiz values, respectively.
This commit is contained in:
NY00123 2020-04-11 00:23:42 +03:00 committed by Christoph Oelckers
parent de0ed067f5
commit 8085c8473d
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/sw/src/game.h
View file

@ -1086,6 +1086,8 @@ typedef struct
int16_t svel; int16_t svel;
fix16_t q16avel; fix16_t q16avel;
fix16_t q16horz; fix16_t q16horz;
fix16_t q16ang;
fix16_t q16horiz;
int32_t bits; int32_t bits;
} SW_PACKET; } SW_PACKET;
#pragma pack(pop) #pragma pack(pop)

18
source/sw/src/network.cpp
View file

@ -106,6 +106,8 @@ typedef struct
int32_t svel; int32_t svel;
fix16_t q16avel; fix16_t q16avel;
fix16_t q16horz; fix16_t q16horz;
fix16_t q16ang;
fix16_t q16horiz;
int32_t bits; int32_t bits;
} SW_AVERAGE_PACKET; } SW_AVERAGE_PACKET;
@ -297,17 +299,21 @@ int EncodeBits(SW_PACKET *pak, SW_PACKET *old_pak, uint8_t* buf)
SET(*base_ptr, BIT(1)); SET(*base_ptr, BIT(1));
} }
if (pak->q16avel != old_pak->q16avel) if ((pak->q16avel != old_pak->q16avel) || (pak->q16ang != old_pak->q16ang))
{ {
*((fix16_t *)buf) = pak->q16avel; *((fix16_t *)buf) = pak->q16avel;
buf += sizeof(pak->q16avel); buf += sizeof(pak->q16avel);
*((fix16_t *)buf) = pak->q16ang;
buf += sizeof(pak->q16ang);
SET(*base_ptr, BIT(2)); SET(*base_ptr, BIT(2));
} }
if (pak->q16horz != old_pak->q16horz) if ((pak->q16horz != old_pak->q16horz) || (pak->q16horiz != old_pak->q16horiz))
{ {
*((fix16_t *)buf) = pak->q16horz; *((fix16_t *)buf) = pak->q16horz;
buf += sizeof(pak->q16horz); buf += sizeof(pak->q16horz);
*((fix16_t *)buf) = pak->q16horiz;
buf += sizeof(pak->q16horiz);
SET(*base_ptr, BIT(3)); SET(*base_ptr, BIT(3));
} }
@ -352,12 +358,16 @@ int DecodeBits(SW_PACKET *pak, SW_PACKET *old_pak, uint8_t* buf)
{ {
pak->q16avel = *(fix16_t *)buf; pak->q16avel = *(fix16_t *)buf;
buf += sizeof(pak->q16avel); buf += sizeof(pak->q16avel);
pak->q16ang = *(fix16_t *)buf;
buf += sizeof(pak->q16ang);
} }
if (TEST(*base_ptr, BIT(3))) if (TEST(*base_ptr, BIT(3)))
{ {
pak->q16horz = *(fix16_t *)buf; pak->q16horz = *(fix16_t *)buf;
buf += sizeof(pak->q16horz); buf += sizeof(pak->q16horz);
pak->q16horiz = *(fix16_t *)buf;
buf += sizeof(pak->q16horiz);
} }
//won't work if > 4 bytes //won't work if > 4 bytes
@ -941,6 +951,8 @@ faketimerhandler(void)
AveragePacket.svel += loc.svel; AveragePacket.svel += loc.svel;
AveragePacket.q16avel += loc.q16avel; AveragePacket.q16avel += loc.q16avel;
AveragePacket.q16horz += loc.q16horz; AveragePacket.q16horz += loc.q16horz;
AveragePacket.q16ang = Player[myconnectindex].camq16ang;
AveragePacket.q16horiz = Player[myconnectindex].camq16horiz;
SET(AveragePacket.bits, loc.bits); SET(AveragePacket.bits, loc.bits);
pp = Player + myconnectindex; pp = Player + myconnectindex;
@ -959,6 +971,8 @@ faketimerhandler(void)
loc.svel = AveragePacket.svel / MovesPerPacket; loc.svel = AveragePacket.svel / MovesPerPacket;
loc.q16avel = fix16_div(AveragePacket.q16avel, fix16_from_int(MovesPerPacket)); loc.q16avel = fix16_div(AveragePacket.q16avel, fix16_from_int(MovesPerPacket));
loc.q16horz = fix16_div(AveragePacket.q16horz, fix16_from_int(MovesPerPacket)); loc.q16horz = fix16_div(AveragePacket.q16horz, fix16_from_int(MovesPerPacket));
loc.q16ang = AveragePacket.q16ang;
loc.q16horiz = AveragePacket.q16horiz;
loc.bits = AveragePacket.bits; loc.bits = AveragePacket.bits;
memset(&AveragePacket, 0, sizeof(AveragePacket)); memset(&AveragePacket, 0, sizeof(AveragePacket));