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

Fix crash when opening new project

Browse source
This commit is contained in:
Marcus Huderle 2020-07-14 18:10:55 -05:00
parent 45cfb3aabd
commit 7d70505b90
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ui/metatileselector.h
View file

@ -30,6 +30,7 @@ public:
QList<QPair<uint16_t, uint16_t>>* getSelectedCollisions(); QList<QPair<uint16_t, uint16_t>>* getSelectedCollisions();
void setExternalSelection(int, int, QList<uint16_t>, QList<QPair<uint16_t, uint16_t>>); void setExternalSelection(int, int, QList<uint16_t>, QList<QPair<uint16_t, uint16_t>>);
QPoint getMetatileIdCoordsOnWidget(uint16_t); QPoint getMetatileIdCoordsOnWidget(uint16_t);
void setMap(Map*);
protected: protected:
void mousePressEvent(QGraphicsSceneMouseEvent*); void mousePressEvent(QGraphicsSceneMouseEvent*);
void mouseMoveEvent(QGraphicsSceneMouseEvent*); void mouseMoveEvent(QGraphicsSceneMouseEvent*);

1
src/editor.cpp
View file

@ -1221,6 +1221,7 @@ void Editor::displayMetatileSelector() {
this, SLOT(onSelectedMetatilesChanged())); this, SLOT(onSelectedMetatilesChanged()));
metatile_selector_item->select(0); metatile_selector_item->select(0);
} else { } else {
metatile_selector_item->setMap(map);
metatile_selector_item->setTilesets(map->layout->tileset_primary, map->layout->tileset_secondary); metatile_selector_item->setTilesets(map->layout->tileset_primary, map->layout->tileset_secondary);
} }

4
src/ui/metatileselector.cpp
View file

@ -189,3 +189,7 @@ QPoint MetatileSelector::getMetatileIdCoordsOnWidget(uint16_t metatileId) {
pos.ry() = (pos.y() * this->cellHeight) + (this->cellHeight / 2); pos.ry() = (pos.y() * this->cellHeight) + (this->cellHeight / 2);
return pos; return pos;
} }
void MetatileSelector::setMap(Map *map) {
this->map = map;
}