OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-14 10:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path matching breaking prematurely

Browse Source
This commit is contained in:
gsemaj 2021-05-05 14:59:24 -04:00 committed by Gent Semaj
parent d41122157f
commit ebd3b7b75a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TableData.cpp
View File

@ -45,18 +45,22 @@ static NPCPath* findApplicablePath(int32_t id, int32_t type) {
for (auto _path = Transport::NPCPaths.begin(); _path != Transport::NPCPaths.end(); _path++) {
// search target IDs
for (int32_t pID : _path->targetIDs) {
if (id == pID) match = &(*_path);
if (id == pID) {
match = &(*_path);
break;
}
}
if (match != nullptr)
break; // early break for ID matches, since ID has higher priority than type
// search target types
for (int32_t pType : _path->targetTypes) {
if (type == pType) match = &(*_path);
if (type == pType) {
match = &(*_path);
break;
}
}
if (match != nullptr)
break;