zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed loading of Blood savegames.

Browse source 
This was a strange case of C++ not doing what was to be expected due to hidden semantics.
Note: never assign {} to a type that has a non-default constructor!
Fixes #212
This commit is contained in:
Christoph Oelckers 2020-12-06 08:18:03 +01:00
parent d04013066c
commit 2f4abf93af
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/blood/src/bloodactor.h
View file

@ -25,6 +25,10 @@ public:
DBloodActor() :index(int(this - base())) { /*assert(index >= 0 && index < kMaxSprites);*/ } DBloodActor() :index(int(this - base())) { /*assert(index >= 0 && index < kMaxSprites);*/ }
DBloodActor& operator=(const DBloodActor& other) = default; DBloodActor& operator=(const DBloodActor& other) = default;
void Clear()
{
dudeSlope = 0;
}
bool hasX() { return sprite[index].extra > 0; } bool hasX() { return sprite[index].extra > 0; }
spritetype& s() { return sprite[index]; } spritetype& s() { return sprite[index]; }
XSPRITE& x() { return xsprite[sprite[index].extra]; } // calling this does not validate the xsprite! XSPRITE& x() { return xsprite[sprite[index].extra]; } // calling this does not validate the xsprite!

3
source/blood/src/loadsave.cpp
View file

@ -443,12 +443,11 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, DBloodActor& w, DB
if (!def) if (!def)
{ {
def = &nul; def = &nul;
if (arc.isReading()) w = {}; if (arc.isReading()) w.Clear();
} }
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
// The rest is only relevant if the actor has an xsprite. // The rest is only relevant if the actor has an xsprite.
if (w.s().extra > 0) if (w.s().extra > 0)
{ {