OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed some errors with parsing globals.json. It looks like this file is being processed correctly now.

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-22 19:36:23 +02:00
commit c22e8c50af
4 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/serializer.cpp
View file

@ -51,7 +51,6 @@ struct FJSONObject
else if (v->IsArray())
{
mIndex = 0;
mIterator = v->MemberEnd();
}
}
};
@ -717,6 +716,7 @@ unsigned FSerializer::GetSize(const char *group)
const char *FSerializer::GetKey()
{
if (isWriting()) return nullptr; // we do not know this when writing.
if (!r->mObjects.Last().mObject->IsObject()) return nullptr; // non-objects do not have keys.
auto &it = r->mObjects.Last().mIterator;
if (it == r->mObjects.Last().mObject->MemberEnd()) return nullptr;
return it->name.GetString();