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

Fix label history being ignored if metatile didn't change

Browse source
This commit is contained in:
GriffinR 2023-02-17 15:40:10 -05:00
parent 465d51f4a0
commit 096c26b85a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ui/tileseteditor.cpp
View file

@ -842,15 +842,16 @@ void TilesetEditor::onPaletteEditorChangedPalette(int paletteId) {
this->on_spinBox_paletteSelector_valueChanged(paletteId); this->on_spinBox_paletteSelector_valueChanged(paletteId);
} }
bool TilesetEditor::replaceMetatile(uint16_t metatileId, const Metatile * src, QString label) bool TilesetEditor::replaceMetatile(uint16_t metatileId, const Metatile * src, QString newLabel)
{ {
Metatile * dest = Tileset::getMetatile(metatileId, this->primaryTileset, this->secondaryTileset); Metatile * dest = Tileset::getMetatile(metatileId, this->primaryTileset, this->secondaryTileset);
if (!dest || !src || *dest == *src) QString oldLabel = Tileset::getOwnedMetatileLabel(metatileId, this->primaryTileset, this->secondaryTileset);
if (!dest || !src || (*dest == *src && oldLabel == newLabel))
return false; return false;
Tileset::setMetatileLabel(metatileId, label, this->primaryTileset, this->secondaryTileset); Tileset::setMetatileLabel(metatileId, newLabel, this->primaryTileset, this->secondaryTileset);
if (metatileId == this->getSelectedMetatileId()) if (metatileId == this->getSelectedMetatileId())
this->ui->lineEdit_metatileLabel->setText(label); this->ui->lineEdit_metatileLabel->setText(newLabel);
this->metatile = dest; this->metatile = dest;
*this->metatile = *src; *this->metatile = *src;