summaryrefslogtreecommitdiff
path: root/src/KingSystem/Map/mapObject.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-07-07 14:10:14 +0200
committerLéo Lam <leo@leolam.fr>2021-07-07 14:34:02 +0200
commit48e70b92bfb82cd0dad6d4f795c36f491be0f2eb (patch)
treee624b6bc646543147cbfaf391b8ee468e2e80ef1 /src/KingSystem/Map/mapObject.cpp
parent1b6c549a38de8fb27d2eb6584888feed972570a2 (diff)
ksys/map: Fix more matching or equivalency issues
Diffstat (limited to 'src/KingSystem/Map/mapObject.cpp')
-rw-r--r--src/KingSystem/Map/mapObject.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index e693439a..d0671bdf 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -420,7 +420,6 @@ bool Object::x_18() const {
return !id->sub_7100D30DF8(info, temp);
}
-// NON_MATCHING
bool Object::setupTargetLinks(Object* src, ObjectLink* link, sead::Heap* heap) {
if (mNumLinksPointingToMe == 0)
return false;
@@ -431,11 +430,10 @@ bool Object::setupTargetLinks(Object* src, ObjectLink* link, sead::Heap* heap) {
return false;
}
- if (mLinkData->mLinksToSelf.links.isBufferReady())
- return mLinkData->sub_7100D4EC40(src, link, this);
-
- if (!mLinkData->allocLinksToSelf(mNumLinksPointingToMe, heap))
- return false;
+ if (!mLinkData->mLinksToSelf.links.isBufferReady()) {
+ if (!mLinkData->allocLinksToSelf(mNumLinksPointingToMe, heap))
+ return false;
+ }
return mLinkData->sub_7100D4EC40(src, link, this);
}