gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow deduplicating tiles with neither an input nor output tileset (#1585)

Browse Source
This commit is contained in:
Rangi
2024-12-30 12:58:07 -05:00
committed by GitHub
parent 5197e6b79f
commit ad95d2e06f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gfx/process.cpp
View File

@@ -999,10 +999,11 @@ static UniqueTiles dedupTiles(
} }
} }
bool inputWithoutOutput = !options.inputTileset.empty() && options.output.empty();
for (auto [tile, attr] : zip(png.visitAsTiles(), attrmap)) { for (auto [tile, attr] : zip(png.visitAsTiles(), attrmap)) {
auto [tileID, matchType] = tiles.addTile({tile, palettes[mappings[attr.protoPaletteID]]}); auto [tileID, matchType] = tiles.addTile({tile, palettes[mappings[attr.protoPaletteID]]});
if (matchType == TileData::NOPE && options.output.empty()) { if (inputWithoutOutput && matchType == TileData::NOPE) {
error( error(
"Tile at (%" PRIu32 ", %" PRIu32 "Tile at (%" PRIu32 ", %" PRIu32
") is not within the input tileset, and `-o` was not given!", ") is not within the input tileset, and `-o` was not given!",