From c804527d7a247aca80b88de56191bb13938de38a Mon Sep 17 00:00:00 2001 From: savage13 Date: Sun, 20 Feb 2022 17:50:28 -0500 Subject: PlacementMap: Add x_0, x_4(); change u16 mStaticCompoundId to s16 mStaticCompundActorId (#85) --- src/KingSystem/Map/mapObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/KingSystem/Map/mapObject.cpp') diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp index d0b57fde..8dc08124 100644 --- a/src/KingSystem/Map/mapObject.cpp +++ b/src/KingSystem/Map/mapObject.cpp @@ -61,7 +61,7 @@ void Object::initData(MubinIter* iter, u8 idx, u32 actor_data_idx, ActorData* da mFlags.makeAllZero(); mIdx = 0; mNumLinksPointingToMe = 0; - mStaticCompoundId = 0xFFFF; + mStaticCompoundActorId = -1; _18 = nullptr; _20 = nullptr; _10 = nullptr; @@ -88,7 +88,7 @@ void Object::initData(MubinIter* iter, u8 idx, u32 actor_data_idx, ActorData* da _10 = nullptr; _18 = nullptr; _20 = nullptr; - mStaticCompoundId = 0xFFFF; + mStaticCompoundActorId = -1; mActorDataIdx = actor_data_idx; mProc = nullptr; mLinkData = nullptr; -- cgit v1.2.3