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

Remove unnecessary null checks

Browse source
This commit is contained in:
GriffinR 2022-10-05 11:10:38 -04:00 committed by Marcus Huderle
parent 564d24c4f3
commit e70b049887
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ui/imageproviders.cpp
View file

@ -23,8 +23,7 @@ QImage getMetatileImage(
bool useTruePalettes) bool useTruePalettes)
{ {
Metatile* metatile = Tileset::getMetatile(metatileId, primaryTileset, secondaryTileset); Metatile* metatile = Tileset::getMetatile(metatileId, primaryTileset, secondaryTileset);
Tileset* blockTileset = Tileset::getMetatileTileset(metatileId, primaryTileset, secondaryTileset); if (!metatile) {
if (!metatile || !blockTileset) {
QImage metatile_image(16, 16, QImage::Format_RGBA8888); QImage metatile_image(16, 16, QImage::Format_RGBA8888);
metatile_image.fill(Qt::magenta); metatile_image.fill(Qt::magenta);
return metatile_image; return metatile_image;

3
src/ui/tileseteditormetatileselector.cpp
View file

@ -52,9 +52,6 @@ QImage TilesetEditorMetatileSelector::buildImage(int metatileIdStart, int numMet
} }
void TilesetEditorMetatileSelector::draw() { void TilesetEditorMetatileSelector::draw() {
if (!this->primaryTileset || !this->secondaryTileset) {
this->setPixmap(QPixmap());
}
this->setPixmap(QPixmap::fromImage(this->buildAllMetatilesImage())); this->setPixmap(QPixmap::fromImage(this->buildAllMetatilesImage()));
this->drawSelection(); this->drawSelection();