atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix increasing metatileset size in tileset editor crashing when triple layer is enabled.

Browse source
This commit is contained in:
ultima-soul 2020-07-09 09:38:02 -07:00 committed by garak
parent 8b600fb59c
commit 38bbb2c4c8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ui/tileseteditor.cpp
View file

@ -638,6 +638,7 @@ void TilesetEditor::on_actionChange_Metatiles_Count_triggered()
if (dialog.exec() == QDialog::Accepted) { if (dialog.exec() == QDialog::Accepted) {
int numPrimaryMetatiles = primarySpinBox->value(); int numPrimaryMetatiles = primarySpinBox->value();
int numSecondaryMetatiles = secondarySpinBox->value(); int numSecondaryMetatiles = secondarySpinBox->value();
int numTiles = projectConfig.getTripleLayerMetatilesEnabled() ? 12 : 8;
while (this->primaryTileset->metatiles->length() > numPrimaryMetatiles) { while (this->primaryTileset->metatiles->length() > numPrimaryMetatiles) {
Metatile *metatile = this->primaryTileset->metatiles->takeLast(); Metatile *metatile = this->primaryTileset->metatiles->takeLast();
delete metatile; delete metatile;
@ -653,7 +654,7 @@ void TilesetEditor::on_actionChange_Metatiles_Count_triggered()
metatile->layerType = 0; metatile->layerType = 0;
metatile->encounterType = 0; metatile->encounterType = 0;
metatile->terrainType = 0; metatile->terrainType = 0;
for (int i = 0; i < 8; i++) { for (int i = 0; i < numTiles; i++) {
metatile->tiles->append(tile); metatile->tiles->append(tile);
} }
this->primaryTileset->metatiles->append(metatile); this->primaryTileset->metatiles->append(metatile);
@ -673,7 +674,7 @@ void TilesetEditor::on_actionChange_Metatiles_Count_triggered()
metatile->layerType = 0; metatile->layerType = 0;
metatile->encounterType = 0; metatile->encounterType = 0;
metatile->terrainType = 0; metatile->terrainType = 0;
for (int i = 0; i < 8; i++) { for (int i = 0; i < numTiles; i++) {
metatile->tiles->append(tile); metatile->tiles->append(tile);
} }
this->secondaryTileset->metatiles->append(metatile); this->secondaryTileset->metatiles->append(metatile);