From 1c3e0b96bdb6af3926f1e384ccc021f1b91c10f0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 9 Oct 2018 17:31:12 -0500 Subject: [PATCH] Fix index out of bound error with tileset editing --- src/ui/tileseteditor.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index 05432e09..28b7097b 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -201,11 +201,13 @@ void TilesetEditor::onMetatileLayerTileChanged(int x, int y) { for (int j = 0; j < dimensions.y(); j++) { for (int i = 0; i < dimensions.x(); i++) { int tileIndex = ((x + i) / 2 * 4) + ((y + j) * 2) + ((x + i) % 2); - Tile *tile = &(*this->metatile->tiles)[tileIndex]; - tile->tile = tiles.at(selectedTileIndex).tile; - tile->xflip = tiles.at(selectedTileIndex).xflip; - tile->yflip = tiles.at(selectedTileIndex).yflip; - tile->palette = tiles.at(selectedTileIndex).palette; + if (tileIndex < 8) { + Tile *tile = &(*this->metatile->tiles)[tileIndex]; + tile->tile = tiles.at(selectedTileIndex).tile; + tile->xflip = tiles.at(selectedTileIndex).xflip; + tile->yflip = tiles.at(selectedTileIndex).yflip; + tile->palette = tiles.at(selectedTileIndex).palette; + } selectedTileIndex++; } }