stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 08:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'public_next'

Browse source
This commit is contained in:
Monster Iestyn 2018-09-17 21:50:19 +01:00
commit fab25a451f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/p_saveg.c
View file

@ -1274,6 +1274,7 @@ typedef enum
tc_bouncecheese, tc_bouncecheese,
tc_startcrumble, tc_startcrumble,
tc_marioblock, tc_marioblock,
tc_marioblockchecker,
tc_spikesector, tc_spikesector,
tc_floatsector, tc_floatsector,
tc_bridgethinker, tc_bridgethinker,
@ -1589,7 +1590,10 @@ static void SaveSpecialLevelThinker(const thinker_t *th, const UINT8 type)
size_t i; size_t i;
WRITEUINT8(save_p, type); WRITEUINT8(save_p, type);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{
WRITEFIXED(save_p, ht->vars[i]); //var[16] WRITEFIXED(save_p, ht->vars[i]); //var[16]
WRITEFIXED(save_p, ht->var2s[i]); //var[16]
}
WRITEUINT32(save_p, SaveLine(ht->sourceline)); WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT32(save_p, SaveSector(ht->sector)); WRITEUINT32(save_p, SaveSector(ht->sector));
} }
@ -2122,6 +2126,11 @@ static void P_NetArchiveThinkers(void)
SaveSpecialLevelThinker(th, tc_marioblock); SaveSpecialLevelThinker(th, tc_marioblock);
continue; continue;
} }
else if (th->function.acp1 == (actionf_p1)T_MarioBlockChecker)
{
SaveSpecialLevelThinker(th, tc_marioblockchecker);
continue;
}
else if (th->function.acp1 == (actionf_p1)T_SpikeSector) else if (th->function.acp1 == (actionf_p1)T_SpikeSector)
{ {
SaveSpecialLevelThinker(th, tc_spikesector); SaveSpecialLevelThinker(th, tc_spikesector);
@ -2517,7 +2526,10 @@ static void LoadSpecialLevelThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
size_t i; size_t i;
ht->thinker.function.acp1 = thinker; ht->thinker.function.acp1 = thinker;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{
ht->vars[i] = READFIXED(save_p); //var[16] ht->vars[i] = READFIXED(save_p); //var[16]
ht->var2s[i] = READFIXED(save_p); //var[16]
}
ht->sourceline = LoadLine(READUINT32(save_p)); ht->sourceline = LoadLine(READUINT32(save_p));
ht->sector = LoadSector(READUINT32(save_p)); ht->sector = LoadSector(READUINT32(save_p));
@ -3110,6 +3122,10 @@ static void P_NetUnArchiveThinkers(void)
LoadSpecialLevelThinker((actionf_p1)T_MarioBlock, 3); LoadSpecialLevelThinker((actionf_p1)T_MarioBlock, 3);
break; break;
case tc_marioblockchecker:
LoadSpecialLevelThinker((actionf_p1)T_MarioBlockChecker, 0);
break;
case tc_spikesector: case tc_spikesector:
LoadSpecialLevelThinker((actionf_p1)T_SpikeSector, 0); LoadSpecialLevelThinker((actionf_p1)T_SpikeSector, 0);
break; break;