zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: Fix linker error under POSIX compilation environments.

Browse source
This commit is contained in:
Mitchell Richters 2021-12-03 11:57:16 +11:00 committed by Christoph Oelckers
parent 94a37dfcdc
commit 46f4f17644
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/games/blood/src/bloodactor.h
View file

@ -369,14 +369,6 @@ inline DBloodActor* getLowerLink(int sect)
return gLowerLink[sect];
}
inline FSerializer& Serialize(FSerializer& arc, const char* keyname, DBloodActor*& w, DBloodActor** def)
{
int index = w? int(w - bloodActors) : -1;
Serialize(arc, keyname, index, nullptr);
if (arc.isReading()) w = index == -1? nullptr : &bloodActors[index];
return arc;
}
inline void sfxPlay3DSound(DBloodActor* pSprite, int soundId, int a3 = -1, int a4 = 0)
{
sfxPlay3DSound(&pSprite->s(), soundId, a3, a4);

8
source/games/blood/src/loadsave.cpp
View file

@ -472,6 +472,14 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, ConditionElement&
return arc;
}
FSerializer& Serialize(FSerializer& arc, const char* keyname, DBloodActor*& w, DBloodActor** def)
{
int index = w? int(w - bloodActors) : -1;
Serialize(arc, keyname, index, nullptr);
if (arc.isReading()) w = index == -1? nullptr : &bloodActors[index];
return arc;
}
FSerializer& Serialize(FSerializer& arc, const char* keyname, DBloodActor& w, DBloodActor* def)
{
static DBloodActor nul;