mirror of
https://github.com/zeldaret/botw
synced 2026-06-03 18:36:08 -04:00
ksys/map: Fix matching issues
This commit is contained in:
@@ -499,7 +499,7 @@ void* Object::getRails() const {
|
||||
void* Object::getRails_0() const {
|
||||
if (mLinkData == nullptr)
|
||||
return nullptr;
|
||||
return mLinkData->mRail;
|
||||
return mLinkData->mRails;
|
||||
}
|
||||
|
||||
bool Object::allocLinkData(sead::Heap* heap) {
|
||||
|
||||
@@ -139,9 +139,9 @@ bool ObjectLink::getObjectProcWithAccessor(act::ActorLinkConstDataAccess& access
|
||||
ObjectLinkData::ObjectLinkData() = default;
|
||||
|
||||
void ObjectLinkData::deleteArrays() {
|
||||
if (mRail) {
|
||||
delete mRail;
|
||||
mRail = nullptr;
|
||||
if (mRails) {
|
||||
delete[] mRails;
|
||||
mRails = nullptr;
|
||||
}
|
||||
|
||||
mLinksOther.links.freeBuffer();
|
||||
@@ -222,9 +222,9 @@ ObjectLink* ObjectLinkArray::findLinkWithType(MapLinkDefType type) {
|
||||
}
|
||||
|
||||
ObjectLink* ObjectLinkArray::findLinkWithType_0(MapLinkDefType type) {
|
||||
for (int i = 0; i < links.size(); ++i) {
|
||||
if (links[i].type == type)
|
||||
return &links[i];
|
||||
for (auto it = links.begin(), end = links.end(); it != end; ++it) {
|
||||
if (it->type == type)
|
||||
return &*it;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ public:
|
||||
bool field_57 = false;
|
||||
|
||||
GenGroup* mGenGroup = nullptr;
|
||||
Rail* mRail = nullptr;
|
||||
Rail* mRails = nullptr;
|
||||
};
|
||||
KSYS_CHECK_SIZE_NX150(ObjectLinkData, 0x68);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user