drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 12 Activity

[nostalgia/gfx] Make getSubSheet check root subsheet name
All checks were successful
Build / build (push) Successful in 1m17s
Details

Browse Source
This commit is contained in:
Gary Talent
2025-07-24 01:54:06 -05:00
parent 51f2905c9c
commit fae1e73e54
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nostalgia/modules/gfx/src/tilesheet.cpp
View File

@ -236,13 +236,19 @@ static ox::Result<SubSheet*> getSubSheet(
ox::Result<TileSheet::SubSheet const*> getSubSheet(
ox::SpanView<ox::StringView> const &idx,
TileSheet const &ts) noexcept {
return getSubSheet<TileSheet::SubSheet const>(idx, 1, ts.subsheet);
if (!idx.empty() && idx[0] == ts.subsheet.name) {
return getSubSheet<TileSheet::SubSheet const>(idx, 1, ts.subsheet);
}
return ox::Error{1, "SubSheet not found"};
}
ox::Result<TileSheet::SubSheet*> getSubSheet(
ox::SpanView<ox::StringView> const &idx,
TileSheet &ts) noexcept {
return getSubSheet<TileSheet::SubSheet>(idx, 1, ts.subsheet);
if (!idx.empty() && idx[0] == ts.subsheet.name) {
return getSubSheet<TileSheet::SubSheet>(idx, 1, ts.subsheet);
}
return ox::Error{1, "SubSheet not found"};
}