diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-07-06 12:49:02 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-07-06 15:43:57 -0700 |
| commit | b74df64276fb87ffebef8c7e0b02bd7052b776d9 (patch) | |
| tree | ff3994ca603445a7e6043cc68e1f751933140348 /src/KingSystem/Map/mapObject.cpp | |
| parent | 4cba2eb093fbc452db88e33643b3ca293ff02213 (diff) | |
move ForestRenderer and ClusteredRenderer
Diffstat (limited to 'src/KingSystem/Map/mapObject.cpp')
| -rw-r--r-- | src/KingSystem/Map/mapObject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp index d198ab44..4cdc137f 100644 --- a/src/KingSystem/Map/mapObject.cpp +++ b/src/KingSystem/Map/mapObject.cpp @@ -2,6 +2,7 @@ #include "KingSystem/ActorSystem/actBaseProcMgr.h" #include "KingSystem/ActorSystem/actInfoData.h" #include "KingSystem/GameData/gdtManager.h" +#include "KingSystem/Graphics/gfxForestRenderer.h" #include "KingSystem/Map/mapObjectLink.h" #include "KingSystem/Map/mapPlacementMgr.h" #include "KingSystem/Map/mapStagePreActorCache.h" @@ -430,7 +431,7 @@ bool Object::setupTargetLinks(Object* src, ObjectLink* link, sead::Heap* heap) { return false; } - if (mLinkData->mLinksToSelf.links != nullptr) + if (mLinkData->mLinksToSelf.links.isBufferReady()) return mLinkData->sub_7100D4EC40(src, link, this); if (!mLinkData->allocLinksToSelf(mNumLinksPointingToMe, heap)) @@ -498,7 +499,7 @@ void* Object::getRails() const { void* Object::getRails_0() const { if (mLinkData == nullptr) return nullptr; - return mLinkData->mRails; + return mLinkData->mRail; } bool Object::allocLinkData(sead::Heap* heap) { |