zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-23 04:22:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: fix serialization of panel sprites

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-03 09:21:08 +02:00
parent 7d26d3b87c
commit a8f2af7257
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/games/sw/src/save.cpp
View file

@ -484,8 +484,6 @@ void DSWPlayer::Serialize(FSerializer& arc)
("WpnFlags", WpnFlags)
.Array("WpnAmmo", WpnAmmo, countof(WpnAmmo))
("WpnNum", WpnNum)
("panelnext", PanelSpriteList.Next)
("panelprev", PanelSpriteList.Prev)
("curwpn", CurWpn)
.Array("wpn", Wpn, countof(Wpn))
("WpnRocketType", WpnRocketType)
@ -536,7 +534,6 @@ void DSWPlayer::Serialize(FSerializer& arc)
("keypressbits", KeyPressBits)
("chops", Chops);
SerializeCodePtr(arc, "DoPlayerAction", (void**)&DoPlayerAction);
if (arc.isReading())
{
@ -544,7 +541,6 @@ void DSWPlayer::Serialize(FSerializer& arc)
obob_z = bob_z;
memset(cookieQuote, 0, sizeof(cookieQuote)); // no need to remember this.
StartColor = 0;
}
}
@ -1063,9 +1059,9 @@ void GameInterface::SerializeGameState(FSerializer& arc)
pspAsArray.Clear();
Saveable_Init();
preSerializePanelSprites(arc);
if (arc.BeginObject("state"))
{
preSerializePanelSprites(arc);
so_serializeinterpolations(arc);
arc("numplayers", numplayers)
("skill", Skill)
@ -1107,10 +1103,27 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("parallaxys", parallaxyscale_override)
("pskybits", pskybits_override)
;
postSerializePanelSprites(arc);
arc.EndObject();
}
// these cannot be deferred to writing out the actors because we need to fill in pspAsArray before calling postSerializePanelSprites.
// The organization of this list is a mess and needs to be refactored into something workable.
if (arc.BeginArray("playerpanelsprites"))
{
for (int i = 0; i < MAXPLAYERS; i++)
{
if (arc.BeginObject(nullptr))
{
auto p = getPlayer(i);
arc("panelnext", p->PanelSpriteList.Next)
("panelprev", p->PanelSpriteList.Prev)
.EndObject();
}
}
arc.EndArray();
}
postSerializePanelSprites(arc);
if (arc.isReading())
{
DoTheCache();