OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- converted player serializer and everything it needs.

Browse source 
This means that everything belonging to the level snapshot will be generated in the JSON output.
This commit is contained in:
Christoph Oelckers 2016-09-21 01:18:29 +02:00
commit da83d9e2bd
11 changed files with 267 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/serializer.cpp
View file

@ -1136,12 +1136,22 @@ FSerializer &Serialize(FSerializer &arc, const char *key, DObject *&value, DObje
if (value != nullptr)
{
int ndx;
int *pndx = arc.w->mObjectMap.CheckKey(value);
if (pndx != nullptr) ndx = *pndx;
if (value == WP_NOCHANGE)
{
ndx = -1;
}
else
{
ndx = arc.w->mDObjects.Push(value);
arc.w->mObjectMap[value] = ndx;
int *pndx = arc.w->mObjectMap.CheckKey(value);
if (pndx != nullptr)
{
ndx = *pndx;
}
else
{
ndx = arc.w->mDObjects.Push(value);
arc.w->mObjectMap[value] = ndx;
}
}
Serialize(arc, key, ndx, nullptr);
}
@ -1149,8 +1159,15 @@ FSerializer &Serialize(FSerializer &arc, const char *key, DObject *&value, DObje
else
{
auto val = arc.r->FindKey(key);
if (val != nullptr)
if (val != nullptr && val->IsInt())
{
if (val->GetInt() == -1)
{
value = WP_NOCHANGE;
}
else
{
}
}
else if (!retcode)
{
@ -1302,7 +1319,14 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, PClassActor
if (!arc.w->inObject() || def == nullptr || clst != *def)
{
arc.WriteKey(key);
arc.w->mWriter.String(clst->TypeName.GetChars());
if (clst == nullptr)
{
arc.w->mWriter.Null();
}
else
{
arc.w->mWriter.String(clst->TypeName.GetChars());
}
}
}
else
@ -1314,6 +1338,10 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, PClassActor
{
clst = PClass::FindActor(val->GetString());
}
else if (val->IsNull())
{
clst = nullptr;
}
else
{
I_Error("string type expected for '%s'", key);
@ -1337,7 +1365,14 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, PClass *&cl
if (!arc.w->inObject() || def == nullptr || clst != *def)
{
arc.WriteKey(key);
arc.w->mWriter.String(clst->TypeName.GetChars());
if (clst == nullptr)
{
arc.w->mWriter.Null();
}
else
{
arc.w->mWriter.String(clst->TypeName.GetChars());
}
}
}
else
@ -1349,6 +1384,10 @@ template<> FSerializer &Serialize(FSerializer &arc, const char *key, PClass *&cl
{
clst = PClass::FindClass(val->GetString());
}
else if (val->IsNull())
{
clst = nullptr;
}
else
{
I_Error("string type expected for '%s'", key);