Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix network bug that would send truncated float on the network, because 

the network expected uint16. Introduced in r1524.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2114 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-07-15 15:52:44 +00:00
parent 6a25589a62
commit 451c5fdd8b
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/multibot.c
View File

@ -845,6 +845,7 @@ BOOL sendWholeDroid(DROID *pD, UDWORD dest)
UDWORD asWeaps[DROID_MAXWEAPS];
int i;
BOOL bNoTarget;
uint16_t direction = pD->direction * 32; // preserve precision
// these asserts are done on the receiving side too
ASSERT( pD->x < (mapWidth << TILE_SHIFT),
@ -889,7 +890,7 @@ BOOL sendWholeDroid(DROID *pD, UDWORD dest)
NetAdd(m,sizecount,pD->NameVersion); sizecount+=sizeof(pD->NameVersion);
NetAdd(m,sizecount,pD->droidType); sizecount+=sizeof(pD->droidType);
NetAdd(m,sizecount,pD->direction); sizecount+=sizeof(pD->direction);
NetAdd(m,sizecount,direction); sizecount+=sizeof(direction);
NetAdd(m,sizecount,pD->pitch); sizecount+=sizeof(pD->pitch);
NetAdd(m,sizecount,pD->roll); sizecount+=sizeof(pD->roll);
NetAdd(m,sizecount,pD->visible); sizecount+=sizeof(pD->visible);
@ -945,6 +946,7 @@ BOOL receiveWholeDroid(NETMSG *m)
UDWORD id;
UBYTE player;
UBYTE i;
uint16_t direction;
// get the stuff
NetGet(m,sizecount,dt.asParts); sizecount+=sizeof(dt.asParts); // build a template
@ -995,7 +997,8 @@ BOOL receiveWholeDroid(NETMSG *m)
NetGet(m,sizecount,pD->NameVersion); sizecount+=sizeof(pD->NameVersion);
NetGet(m,sizecount,pD->droidType); sizecount+=sizeof(pD->droidType);
NetGet(m,sizecount,pD->direction); sizecount+=sizeof(pD->direction);
NetGet(m,sizecount, direction); sizecount+=sizeof(direction);
pD->direction = (float)direction / 32;
NetGet(m,sizecount,pD->pitch); sizecount+=sizeof(pD->pitch);
NetGet(m,sizecount,pD->roll); sizecount+=sizeof(pD->roll);

19
src/multisync.c
View File

@ -274,13 +274,14 @@ static void packageCheck(UDWORD i, NETMSG *pMsg, DROID *pD)
{
// UDWORD packtemp;
UWORD numkills; //
uint16_t direction = pD->direction * 32; // preserve some precision
pMsg->body[ i+0] = (char)pD->player;
pMsg->body[ i+1] = (char)pD->order; // order being executed
NetAdd2( pMsg, i+2, pD->id); // droid id
NetAdd2( pMsg, i+6, pD->secondaryOrder );
NetAdd2( pMsg, i+10, pD->body); // damage points
NetAdd2( pMsg, i+14, pD->direction); // direction
NetAdd2( pMsg, i+14, direction); // direction
if( pD->order == DORDER_ATTACK || pD->order == DORDER_ATTACK_M || pD->order == DORDER_MOVE || pD->order == DORDER_RTB || pD->order == DORDER_RTR)
{
@ -692,6 +693,8 @@ static BOOL sendStructureCheck(void)
pS = pickAStructure();
if(pS && (pS->status == SS_BUILT)) // only send info about complete buildings.
{
uint16_t direction = pS->direction * 32; // save some precision by multiplying by 32
m.body[0] = (char)pS->player; // send struct details
NetAdd(m,1,pS->id);
@ -700,7 +703,7 @@ static BOOL sendStructureCheck(void)
NetAdd(m,11,pS->x); //position
NetAdd(m,13,pS->y);
NetAdd(m,15,pS->z);
NetAdd(m,17,pS->direction);
NetAdd(m, 17, direction);
m.type = NET_CHECK_STRUCT;
m.size = 19;
@ -736,12 +739,13 @@ static BOOL sendStructureCheck(void)
// receive checking info about a structure and update local world state
BOOL recvStructureCheck( NETMSG *m)
{
UWORD x,y,z,dir;
UWORD x,y,z;
UDWORD ref,type,j;
UBYTE i,player;
UBYTE cap;
STRUCTURE *pS;
STRUCTURE_STATS *psStats;
uint16_t direction;
player = m->body[0];
NetGet(m,1,ref);
@ -750,7 +754,8 @@ BOOL recvStructureCheck( NETMSG *m)
if(pS)
{
NetGet(m,5,pS->body); // Damage update.
NetGet(m,17,pS->direction);
NetGet(m, 17, direction);
pS->direction = (float)direction / 32; // preserve some precision
}
else // structure wasn't found, create it.
{
@ -758,7 +763,7 @@ BOOL recvStructureCheck( NETMSG *m)
NetGet(m,11,x);
NetGet(m,13,y);
NetGet(m,15,z);
NetGet(m,17,dir);
NetGet(m, 17, direction);
NETlogEntry("scheck:structure check failed, adding struct. val=type",0,type-REF_STRUCTURE_START);
@ -778,7 +783,7 @@ BOOL recvStructureCheck( NETMSG *m)
&& (pS->player == player )
)
{
pS->direction = dir;
pS->direction = (float)direction / 32;
pS->id = ref;
if(pS->status != SS_BUILT)
{
@ -836,7 +841,7 @@ BOOL recvStructureCheck( NETMSG *m)
{
if( pS->status != SS_BUILT) // check its finished
{
pS->direction = dir;
pS->direction = (float)direction / 32;
pS->id = ref;
pS->status = SS_BUILT;
buildingComplete(pS);