zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 01:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed some 'pragma' cruft.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-05 23:58:58 +02:00
parent f0f17fa34f
commit 8d3199514d
9 changed files with 16 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/rr/src/net.cpp
View file

@ -1798,8 +1798,8 @@ void Net_GetInput(void)
if (g_player[myconnectindex].movefifoend&(g_movesPerPacket-1))
{
copybufbyte(&inputfifo[(g_player[myconnectindex].movefifoend-1)&(MOVEFIFOSIZ-1)][myconnectindex],
&inputfifo[g_player[myconnectindex].movefifoend&(MOVEFIFOSIZ-1)][myconnectindex],sizeof(input_t));
memcpy(&inputfifo[g_player[myconnectindex].movefifoend & (MOVEFIFOSIZ - 1)][myconnectindex],
&inputfifo[(g_player[myconnectindex].movefifoend - 1) & (MOVEFIFOSIZ - 1)][myconnectindex], sizeof(input_t));
g_player[myconnectindex].movefifoend++;
return;
}
@ -2176,7 +2176,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
continue;
}
copybufbyte(&osyn[i],&nsyn[i],sizeof(input_t));
memcpy(&nsyn[i],&osyn[i],sizeof(input_t));
if (l&1) nsyn[i].fvel = packbuf[j]+((short)packbuf[j+1]<<8), j += 2;
if (l&2) nsyn[i].svel = packbuf[j]+((short)packbuf[j+1]<<8), j += 2;
if (l&4)
@ -2215,7 +2215,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
if (i != myconnectindex)
for (j=g_movesPerPacket-1;j>=1;j--)
{
copybufbyte(&nsyn[i],&inputfifo[g_player[i].movefifoend&(MOVEFIFOSIZ-1)][i],sizeof(input_t));
memcpy(&inputfifo[g_player[i].movefifoend&(MOVEFIFOSIZ-1)][i], &nsyn[i],sizeof(input_t));
g_player[i].movefifoend++;
}
@ -2229,7 +2229,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
osyn = (input_t *)&inputfifo[(g_player[other].movefifoend-1)&(MOVEFIFOSIZ-1)][0];
nsyn = (input_t *)&inputfifo[(g_player[other].movefifoend)&(MOVEFIFOSIZ-1)][0];
copybufbyte(&osyn[other],&nsyn[other],sizeof(input_t));
memcpy(&nsyn[other], &osyn[other], sizeof(input_t));
if (k&1) nsyn[other].fvel = packbuf[j]+((short)packbuf[j+1]<<8), j += 2;
if (k&2) nsyn[other].svel = packbuf[j]+((short)packbuf[j+1]<<8), j += 2;
if (k&4)
@ -2268,7 +2268,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
for (i=g_movesPerPacket-1;i>=1;i--)
{
copybufbyte(&nsyn[other],&inputfifo[g_player[other].movefifoend&(MOVEFIFOSIZ-1)][other],sizeof(input_t));
memcpy(&inputfifo[g_player[other].movefifoend&(MOVEFIFOSIZ-1)][other], &nsyn[other], sizeof(input_t));
g_player[other].movefifoend++;
}
@ -2292,7 +2292,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
osyn = (input_t *)&inputfifo[(g_player[other].movefifoend-1)&(MOVEFIFOSIZ-1)][0];
nsyn = (input_t *)&inputfifo[(g_player[other].movefifoend)&(MOVEFIFOSIZ-1)][0];
copybufbyte(&osyn[other],&nsyn[other],sizeof(input_t));
memcpy(&nsyn[other], &osyn[other], sizeof(input_t));
k = packbuf[j] + (int)(packbuf[j+1]<<8);
j += 2;
@ -2328,7 +2328,7 @@ void Net_ParsePacket(uint8_t *packbuf, int packbufleng)
for (i=g_movesPerPacket-1;i>=1;i--)
{
copybufbyte(&nsyn[other],&inputfifo[g_player[other].movefifoend&(MOVEFIFOSIZ-1)][other],sizeof(input_t));
memcpy(&inputfifo[g_player[other].movefifoend&(MOVEFIFOSIZ-1)][other], &nsyn[other], sizeof(input_t));
g_player[other].movefifoend++;
}

6
source/rr/src/premap.cpp
View file

@ -2185,8 +2185,8 @@ void G_ClearFIFO(void)
{
Net_ClearFIFO();
clearbufbyte(&localInput, sizeof(input_t), 0L);
clearbufbyte(&inputfifo, sizeof(input_t) * MOVEFIFOSIZ * MAXPLAYERS, 0L);
memset(&localInput, 0, sizeof(input_t));
memset(&inputfifo, 0, sizeof(input_t) * MOVEFIFOSIZ * MAXPLAYERS);
for (bsize_t p = 0; p <= MAXPLAYERS - 1; ++p)
{
@ -2380,8 +2380,6 @@ int G_EnterLevel(int gameMode)
Bmemset(gotpic, 0, sizeof(gotpic));
Bmemset(precachehightile, 0, sizeof(precachehightile));
//clearbufbyte(Actor,sizeof(Actor),0l); // JBF 20040531: yes? no?
prelevel(gameMode);
G_InitRRRASkies();