From 1e67767cf988af08e79d8cea4ee1e4d47658fe29 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sun, 7 Mar 2021 15:01:48 -0300 Subject: Fix collision extraction from actor's data (#85) * Fix collision extraction if it is in actor's data Signed-off-by: Angie * Seg2Filespace to avoid duplicated code and rename the macro SEG2FILESPACE to GETSEGOFFSET Also, try to use the macros GETSEGOFFSET and GETSEGNUM as much as possible. Signed-off-by: angie * Reverse variables names Signed-off-by: angie --- ZAPD/ZRoom/Commands/SetActorList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ZAPD/ZRoom/Commands/SetActorList.cpp') diff --git a/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPD/ZRoom/Commands/SetActorList.cpp index ef4262f..30ed52e 100644 --- a/ZAPD/ZRoom/Commands/SetActorList.cpp +++ b/ZAPD/ZRoom/Commands/SetActorList.cpp @@ -11,7 +11,7 @@ using namespace std; SetActorList::SetActorList(ZRoom* nZRoom, std::vector rawData, int rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { numActors = rawData[rawDataIndex + 1]; - segmentOffset = SEG2FILESPACE(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); + segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); _rawData = rawData; _rawDataIndex = rawDataIndex; -- cgit v1.2.3