OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- converted the basic savegame loader so that all remnant of FArchive have been removed now.

Browse source
This commit is contained in:
Christoph Oelckers 2016-09-22 00:18:31 +02:00
commit 1c9dbc3c36
11 changed files with 186 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/serializer.cpp
View file

@ -730,7 +730,7 @@ const char *FSerializer::GetKey()
void FSerializer::WriteObjects()
{
if (isWriting())
if (isWriting() && w->mDObjects.Size())
{
BeginArray("objects");
// we cannot use the C++11 shorthand syntax here because the array may grow while being processed.
@ -769,6 +769,7 @@ void FSerializer::WriteObjects()
const char *FSerializer::GetOutput(unsigned *len)
{
if (isReading()) return nullptr;
WriteObjects();
EndObject();
if (len != nullptr)
{
@ -787,6 +788,7 @@ FCompressedBuffer FSerializer::GetCompressedOutput()
{
if (isReading()) return{ 0,0,0,0,0,nullptr };
FCompressedBuffer buff;
WriteObjects();
EndObject();
buff.mSize = (unsigned)w->mOutString.GetSize();
buff.mZipFlags = 0;