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

patch over the savegame problems with FState.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-06 19:57:02 +02:00
parent a1cbeb1b0d
commit 71e44ac7ae
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,6 +175,16 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, PANEL_STATE*& w, P
return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(PANEL_STATE)); return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(PANEL_STATE));
} }
FSerializer& _Serialize(FSerializer& arc, const char* keyname, FState*& w, FState** def)
{
return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(FState));
}
FSerializer& _Serialize(FSerializer& arc, const char* keyname, FState**& w, FState*** def)
{
return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(FState*));
}
FSerializer& Serialize(FSerializer& arc, const char* keyname, ACTOR_ACTION_SET*& w, ACTOR_ACTION_SET** def) FSerializer& Serialize(FSerializer& arc, const char* keyname, ACTOR_ACTION_SET*& w, ACTOR_ACTION_SET** def)
{ {
return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(ACTOR_ACTION_SET)); return SerializeDataPtr(arc, keyname, *(void**)&w, sizeof(ACTOR_ACTION_SET));
@ -583,12 +593,21 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, USER& w, USER* def
} }
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
arc("WallP", w.WallP, def->WallP) // The default serializer cannot handle the statically defined states so call these functons explicitly.
_Serialize(arc, "State", w.__legacyState.State, &def->__legacyState.State);
_Serialize(arc, "Rot", w.__legacyState.Rot, &def->__legacyState.Rot);
_Serialize(arc, "StateStart", w.__legacyState.StateStart, &def->__legacyState.StateStart);
_Serialize(arc, "StateEnd", w.__legacyState.StateEnd, &def->__legacyState.StateEnd);
_Serialize(arc, "StateFallOverride", w.__legacyState.StateFallOverride, &def->__legacyState.StateFallOverride);
/*
("State", w.__legacyState.State, def->__legacyState.State) ("State", w.__legacyState.State, def->__legacyState.State)
//("Rot", w.__legacyState.Rot, def->__legacyState.Rot) ("Rot", w.__legacyState.Rot, def->__legacyState.Rot)
("StateStart", w.__legacyState.StateStart, def->__legacyState.StateStart) ("StateStart", w.__legacyState.StateStart, def->__legacyState.StateStart)
("StateEnd", w.__legacyState.StateEnd, def->__legacyState.StateEnd) ("StateEnd", w.__legacyState.StateEnd, def->__legacyState.StateEnd)
//("StateFallOverride", w.__legacyState.StateFallOverride, def->__legacyState.StateFallOverride) ("StateFallOverride", w.__legacyState.StateFallOverride, def->__legacyState.StateFallOverride)
*/
arc
("WallP", w.WallP, def->WallP)
("ActorActionSet", w.__legacyState.ActorActionSet, def->__legacyState.ActorActionSet) ("ActorActionSet", w.__legacyState.ActorActionSet, def->__legacyState.ActorActionSet)
("Personality", w.Personality, def->Personality) ("Personality", w.Personality, def->Personality)
("Attrib", w.__legacyState.Attrib, def->__legacyState.Attrib) ("Attrib", w.__legacyState.Attrib, def->__legacyState.Attrib)