Skip to content

INF parsing fixes for split seq blocks. #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luciusDXL merged 1 commit into from
Feb 10, 2026
Merged

INF parsing fixes for split seq blocks. #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions TheForceEngine/TFE_Editor/LevelEditor/levelEditorData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ namespace LevelEditor
void levelClear()
{
// Clear the INF data.
s_levelInf.item.clear();
s_levelInf.elevator.clear();
s_levelInf.teleport.clear();
s_levelInf.trigger.clear();
Expand All @@ -529,6 +530,7 @@ namespace LevelEditor
FileUtil::stripExtension(asset->name.c_str(), slotName);

// Clear the INF data.
s_levelInf.item.clear();
s_levelInf.elevator.clear();
s_levelInf.teleport.clear();
s_levelInf.trigger.clear();
Expand Down
23 changes: 23 additions & 0 deletions TheForceEngine/TFE_Editor/LevelEditor/levelEditorInf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,6 +1231,26 @@ namespace LevelEditor
return true;
}

void mergeExistingInfItem()
{
Editor_InfItem* last = &s_levelInf.item.back();
Editor_InfItem* item = s_levelInf.item.data();
for (s32 i = 0; i < (s32)s_levelInf.item.size() - 1; i++, item++) // -1: dont match self
{
if (item->name == last->name && item->wallNum == last->wallNum)
{
LE_WARNING("Merging INF item - Name: %s - Wall number: %d", last->name.c_str(), last->wallNum);
for (size_t j = 0; j < last->classData.size(); j++)
{
s_levelInf.item[i].classData.push_back(s_levelInf.item.back().classData[j]);
}

s_levelInf.item.pop_back();
return;
}
}
}

bool loadLevelInfFromAsset(const Asset* asset)
{
char infFile[TFE_MAX_PATH];
Expand Down Expand Up @@ -1454,6 +1474,9 @@ namespace LevelEditor
} // while (!seqEnd) - outer (Line Classes).
} break;
}

// Fix up sibling classes split over multiple seq blocks if we can
mergeExistingInfItem();
}

return true;
Expand Down