diff options
| author | savage13 <savage13@gmail.com> | 2022-02-20 17:50:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 23:50:28 +0100 |
| commit | c804527d7a247aca80b88de56191bb13938de38a (patch) | |
| tree | 8e9a7e4492ca1f1433e2f00deefa795b1021f25e /src/KingSystem/Map/mapObject.cpp | |
| parent | 4e21ee7613e08cf59e7504844568f7eea067dde8 (diff) | |
PlacementMap: Add x_0, x_4(); change u16 mStaticCompoundId to s16 mStaticCompundActorId (#85)
Diffstat (limited to 'src/KingSystem/Map/mapObject.cpp')
| -rw-r--r-- | src/KingSystem/Map/mapObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |