falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/map: Fix matching issues

This commit is contained in:
Léo Lam 2021-07-07 13:58:36 +02:00
parent 4b6b81b190
commit 1b6c549a38
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KingSystem/Map/mapObject.cpp
View File

@ -499,7 +499,7 @@ void* Object::getRails() const {
void* Object::getRails_0() const { void* Object::getRails_0() const {
if (mLinkData == nullptr) if (mLinkData == nullptr)
return nullptr; return nullptr;
return mLinkData->mRail; return mLinkData->mRails;
} }
bool Object::allocLinkData(sead::Heap* heap) { bool Object::allocLinkData(sead::Heap* heap) {

12
src/KingSystem/Map/mapObjectLink.cpp
View File

@ -139,9 +139,9 @@ bool ObjectLink::getObjectProcWithAccessor(act::ActorLinkConstDataAccess& access
ObjectLinkData::ObjectLinkData() = default; ObjectLinkData::ObjectLinkData() = default;
void ObjectLinkData::deleteArrays() { void ObjectLinkData::deleteArrays() {
if (mRail) { if (mRails) {
delete mRail; delete[] mRails;
mRail = nullptr; mRails = nullptr;
} }
mLinksOther.links.freeBuffer(); mLinksOther.links.freeBuffer();
@ -222,9 +222,9 @@ ObjectLink* ObjectLinkArray::findLinkWithType(MapLinkDefType type) {
} }
ObjectLink* ObjectLinkArray::findLinkWithType_0(MapLinkDefType type) { ObjectLink* ObjectLinkArray::findLinkWithType_0(MapLinkDefType type) {
for (int i = 0; i < links.size(); ++i) { for (auto it = links.begin(), end = links.end(); it != end; ++it) {
if (links[i].type == type) if (it->type == type)
return &links[i]; return &*it;
} }
return nullptr; return nullptr;
} }

2
src/KingSystem/Map/mapObjectLink.h
View File

@ -127,7 +127,7 @@ public:
bool field_57 = false; bool field_57 = false;
GenGroup* mGenGroup = nullptr; GenGroup* mGenGroup = nullptr;
Rail* mRail = nullptr; Rail* mRails = nullptr;
}; };
KSYS_CHECK_SIZE_NX150(ObjectLinkData, 0x68); KSYS_CHECK_SIZE_NX150(ObjectLinkData, 0x68);