OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved new code to its proper location and started moving the replaced old archive code to a placeholder file for easy removal later.

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-19 10:34:54 +02:00
commit c665cc53f9
13 changed files with 1391 additions and 1253 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/serializer.cpp
View file

@ -504,7 +504,9 @@ void FSerializer::WriteObjects()
BeginObject(nullptr);
WriteKey("classtype");
w->mWriter.String(w->mDObjects[i]->GetClass()->TypeName.GetChars());
w->mDObjects[i]->SerializeUserVars(*this);
w->mDObjects[i]->Serialize(*this);
w->mDObjects[i]->CheckIfSerialized();
EndObject();
}
EndArray();
@ -1144,8 +1146,18 @@ FSerializer &Serialize(FSerializer &arc, const char *key, FState *&state, FState
}
else if (val->IsArray())
{
//rapidjson::Value cls = (*val)[0];
//rapidjson::Value ndx = (*val)[1];
const rapidjson::Value &cls = (*val)[0];
const rapidjson::Value &ndx = (*val)[1];
state = nullptr;
if (cls.IsString() && ndx.IsInt())
{
PClassActor *clas = PClass::FindActor(cls.GetString());
if (clas)
{
state = clas->OwnedStates + ndx.GetInt();
}
}
}
else
{