Merge branch 'mario-block-sync' into 'next'
Fix for Mario block FOF texture synchronisation in netgames See merge request STJr/SRB2!279
This commit is contained in:
commit
22ee740fa8
|
@ -950,6 +950,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,
|
||||||
|
@ -1774,6 +1775,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);
|
||||||
|
@ -2730,6 +2736,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;
|
||||||
|
|
Loading…
Reference in a new issue