Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-26 18:47:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into new-map-dialog

Browse Source
This commit is contained in:
GriffinR
2024-12-28 01:47:02 -05:00
committed by GitHub
parent 8bd71a3860 2ca703e652
commit 72f37d8983
11 changed files with 216 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/ui/imageproviders.h
View File

@@ -8,8 +8,8 @@
QImage getCollisionMetatileImage(Block);
QImage getCollisionMetatileImage(int, int);
QImage getMetatileImage(uint16_t, Tileset*, Tileset*, QList<int>, QList<float>, bool useTruePalettes = false);
QImage getMetatileImage(Metatile*, Tileset*, Tileset*, QList<int>, QList<float>, bool useTruePalettes = false);
QImage getMetatileImage(uint16_t, Tileset*, Tileset*, const QList<int>&, const QList<float>&, bool useTruePalettes = false);
QImage getMetatileImage(Metatile*, Tileset*, Tileset*, const QList<int>&, const QList<float>&, bool useTruePalettes = false);
QImage getTileImage(uint16_t, Tileset*, Tileset*);
QImage getPalettedTileImage(uint16_t, Tileset*, Tileset*, int, bool useTruePalettes = false);
QImage getGreyscaleTileImage(uint16_t tile, Tileset *primaryTileset, Tileset *secondaryTileset);

2
include/ui/projectsettingseditor.h
View File

@@ -36,7 +36,7 @@ private:
bool projectNeedsReload = false;
bool refreshing = false;
const QString baseDir;
QHash<QString, QString> editedPokemonIconPaths;
QMap<QString, QString> editedPokemonIconPaths;
QString prevIconSpecies;
void initUi();