Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-09 17:35:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore invalid metatiles in selection calls to metatile selectors

Browse Source
This commit is contained in:
GriffinR
2020-07-08 03:56:27 -04:00
committed by garak
parent 35af5557d3
commit 8b600fb59c
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/ui/metatileselector.h
View File

@@ -23,8 +23,8 @@ public:
}
QPoint getSelectionDimensions();
void draw();
void select(uint16_t metatile);
void selectFromMap(uint16_t metatileId, uint16_t collision, uint16_t elevation);
bool select(uint16_t metatile);
bool selectFromMap(uint16_t metatileId, uint16_t collision, uint16_t elevation);
void setTilesets(Tileset*, Tileset*);
QList<uint16_t>* getSelectedMetatiles();
QList<QPair<uint16_t, uint16_t>>* getSelectedCollisions();

2
include/ui/tileseteditor.h
View File

@@ -39,7 +39,7 @@ public:
~TilesetEditor();
void setMap(Map*);
void setTilesets(QString, QString);
void selectMetatile(uint16_t metatileId);
bool selectMetatile(uint16_t metatileId);
private slots:
void onHoveredMetatileChanged(uint16_t);

2
include/ui/tileseteditormetatileselector.h
View File

@@ -17,7 +17,7 @@ public:
}
Map *map = nullptr;
void draw();
void select(uint16_t metatileId);
bool select(uint16_t metatileId);
void setTilesets(Tileset*, Tileset*);
uint16_t getSelectedMetatile();
void updateSelectedMetatile();