Merge pull request #108 from Phlosioneer/metatile-labels

Add a way to name metatiles, for use in c code
This commit is contained in:
garak
2019-09-08 20:15:00 -04:00
committed by GitHub
8 changed files with 171 additions and 6 deletions

View File

@@ -3,6 +3,7 @@
#include "tile.h"
#include <QImage>
#include <QString>
class Metatile
{
@@ -12,6 +13,7 @@ public:
QList<Tile> *tiles = nullptr;
uint8_t behavior;
uint8_t layerType;
QString label;
Metatile *copy();
void copyInPlace(Metatile*);

View File

@@ -91,6 +91,7 @@ public:
void loadTilesetAssets(Tileset*);
void loadTilesetTiles(Tileset*, QImage);
void loadTilesetMetatiles(Tileset*);
void loadTilesetMetatileLabels(Tileset*);
void saveLayoutBlockdata(Map*);
void saveLayoutBorder(Map*);
@@ -103,6 +104,7 @@ public:
void saveMapConstantsHeader();
void saveHealLocationStruct(Map*);
void saveTilesets(Tileset*, Tileset*);
void saveTilesetMetatileLabels(Tileset*, Tileset*);
void saveTilesetMetatileAttributes(Tileset*);
void saveTilesetMetatiles(Tileset*);
void saveTilesetTilesImage(Tileset*);

View File

@@ -73,6 +73,8 @@ private slots:
void on_comboBox_metatileBehaviors_activated(const QString &arg1);
void on_lineEdit_metatileLabel_editingFinished();
void on_comboBox_layerType_activated(int arg1);
void on_actionExport_Primary_Tiles_Image_triggered();
@@ -93,6 +95,7 @@ private:
void importTilesetTiles(Tileset*, bool);
void importTilesetMetatiles(Tileset*, bool);
void refresh();
void saveMetatileLabel();
Ui::TilesetEditor *ui;
History<MetatileHistoryItem*> metatileHistory;
TilesetEditorMetatileSelector *metatileSelector = nullptr;