From 46f4f17644816a7927e4472f3f0a8f5690ad02e0 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Fri, 3 Dec 2021 11:57:16 +1100 Subject: [PATCH] - Blood: Fix linker error under POSIX compilation environments. --- source/games/blood/src/bloodactor.h | 8 -------- source/games/blood/src/loadsave.cpp | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/games/blood/src/bloodactor.h b/source/games/blood/src/bloodactor.h index c2890c3be..f2bf05121 100644 --- a/source/games/blood/src/bloodactor.h +++ b/source/games/blood/src/bloodactor.h @@ -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); diff --git a/source/games/blood/src/loadsave.cpp b/source/games/blood/src/loadsave.cpp index ce24b52eb..503add34a 100644 --- a/source/games/blood/src/loadsave.cpp +++ b/source/games/blood/src/loadsave.cpp @@ -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;