teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: eliminate ptr->byte idx conversion of action/move/ai in t_data.

Browse source 
These are element indices for a while now.  Also eliminate some dead
code afterwards.

git-svn-id: https://svn.eduke32.com/eduke32@2731 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-03 19:20:26 +00:00
parent 6fc99bcdf3
commit 56114a608d
1 changed files with 4 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
polymer/eduke32/source/net.c
View file

@ -100,40 +100,8 @@ void Net_SaveMapState(netmapstate_t *save)
for (i=MAXSPRITES-1; i>=0; i--) for (i=MAXSPRITES-1; i>=0; i--)
{
save->scriptptrs[i] = 0; save->scriptptrs[i] = 0;
if (actorscrptr[PN] == 0) continue;
j = (intptr_t)&script[0];
if (T2 >= j && T2 < (intptr_t)(&script[g_scriptSize]))
{
save->scriptptrs[i] |= 1;
T2 -= j;
#ifdef __x86_64__
T2 >>= 1;
#endif
}
if (T5 >= j && T5 < (intptr_t)(&script[g_scriptSize]))
{
save->scriptptrs[i] |= 2;
T5 -= j;
#ifdef __x86_64__
T5 >>= 1;
#endif
}
if (T6 >= j && T6 < (intptr_t)(&script[g_scriptSize]))
{
save->scriptptrs[i] |= 4;
T6 -= j;
#ifdef __x86_64__
T6 >>= 1;
#endif
}
}
Bmemcpy(&save->actor[0],&actor[0],offsetof(netactor_t, t_data[0])*MAXSPRITES); Bmemcpy(&save->actor[0],&actor[0],offsetof(netactor_t, t_data[0])*MAXSPRITES);
@ -142,34 +110,6 @@ void Net_SaveMapState(netmapstate_t *save)
save->actor[i].t_data[j] = actor[i].t_data[j]; save->actor[i].t_data[j] = actor[i].t_data[j];
for (i=MAXSPRITES-1; i>=0; i--)
{
if (actorscrptr[PN] == 0) continue;
j = (intptr_t)&script[0];
if (save->scriptptrs[i]&1)
{
#ifdef __x86_64__
T2 <<= 1;
#endif
T2 += j;
}
if (save->scriptptrs[i]&2)
{
#ifdef __x86_64__
T5 <<= 1;
#endif
T5 += j;
}
if (save->scriptptrs[i]&4)
{
#ifdef __x86_64__
T6 <<= 1;
#endif
T6 += j;
}
}
Bmemcpy(&save->g_numCyclers,&g_numCyclers,sizeof(g_numCyclers)); Bmemcpy(&save->g_numCyclers,&g_numCyclers,sizeof(g_numCyclers));
Bmemcpy(&save->cyclers[0][0],&cyclers[0][0],sizeof(cyclers)); Bmemcpy(&save->cyclers[0][0],&cyclers[0][0],sizeof(cyclers));
@ -268,31 +208,6 @@ void Net_RestoreMapState(netmapstate_t *save)
for (j=0;j<10;j++) for (j=0;j<10;j++)
actor[i].t_data[j] = save->actor[i].t_data[j]; actor[i].t_data[j] = save->actor[i].t_data[j];
for (i=MAXSPRITES-1; i>=0; i--)
{
j = (intptr_t)(&script[0]);
if (save->scriptptrs[i]&1)
{
#ifdef __x86_64__
T2 <<= 1;
#endif
T2 += j;
}
if (save->scriptptrs[i]&2)
{
#ifdef __x86_64__
T5 <<= 1;
#endif
T5 += j;
}
if (save->scriptptrs[i]&4)
{
#ifdef __x86_64__
T6 <<= 1;
#endif
T6 += j;
}
}
Bmemcpy(&g_numCyclers,&save->g_numCyclers,sizeof(g_numCyclers)); Bmemcpy(&g_numCyclers,&save->g_numCyclers,sizeof(g_numCyclers));
@ -1040,29 +955,15 @@ void Net_ParseServerPacket(ENetEvent *event)
i = g_player[l].ps->i; i = g_player[l].ps->i;
{ {
int16_t jj = j++;
int32_t oa; int32_t oa;
if (T5 >= (intptr_t)&script[0] && T5 < (intptr_t)&script[g_scriptSize]) j++;
{ oa = T5;
oa = T5-(intptr_t)&script[0];
#ifdef __x86_64__
oa >>= 1;
#endif
}
else oa = T5;
T5 = *(int32_t *)&pbuf[j]; T5 = *(int32_t *)&pbuf[j];
j += sizeof(int32_t); j += sizeof(int32_t);
if (oa != T5) T3 = T4 = 0; if (oa != T5) T3 = T4 = 0;
if (pbuf[jj] & 2)
{
#ifdef __x86_64__
T5 <<= 1;
#endif
T5 += (intptr_t)&script[0];
}
} }
do do
@ -1768,34 +1669,11 @@ void Net_UpdateClients(void)
i = g_player[l].ps->i; i = g_player[l].ps->i;
{ {
int32_t jj, oa; packbuf[siz++] = 0;
packbuf[(jj = siz++)] = 0;
if (T5 >= (intptr_t)&script[0] && T5 < (intptr_t)(&script[g_scriptSize]))
{
packbuf[jj] |= 2;
T5 -= (intptr_t)&script[0];
#ifdef __x86_64__
T5 >>= 1;
#endif
}
oa = T5;
*(int32_t *)&packbuf[siz] = T5; *(int32_t *)&packbuf[siz] = T5;
siz += sizeof(int32_t); siz += sizeof(int32_t);
if (oa != T5) T3 = T4 = 0;
if (packbuf[jj] & 2)
{
#ifdef __x86_64__
T5 <<= 1;
#endif
T5 += (intptr_t)&script[0];
}
} }
{ {