Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 20:36:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/huderlem/porymap into fix-json

Browse Source
This commit is contained in:
GriffinR
2022-10-17 22:20:06 -04:00
parent 5e83c1f716 f5c050828e
commit e2a31336c5
42 changed files with 4260 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/project.h
View File

@@ -5,7 +5,6 @@
#include "map.h"
#include "blockdata.h"
#include "heallocation.h"
#include "event.h"
#include "wildmoninfo.h"
#include "parseutil.h"
#include "orderedjson.h"
@@ -83,6 +82,8 @@ public:
QMap<QString, qint64> modifiedFileTimestamps;
bool usingAsmTilesets;
const QPixmap entitiesPixmap = QPixmap(":/images/Entities_16x16.png");
void set_root(QString);
void initSignals();
@@ -194,7 +195,7 @@ public:
bool readEventGraphics();
QMap<QString, QMap<QString, QString>> readObjEventGfxInfo();
void setEventPixmap(Event * event, bool forceLoad = false);
void setEventPixmap(Event *event, bool forceLoad = false);
QString fixPalettePath(QString path);
QString fixGraphicPath(QString path);
@@ -204,6 +205,7 @@ public:
QString getMapScriptsFilePath(const QString &mapName) const;
QStringList getEventScriptsFilePaths() const;
QCompleter *getEventScriptLabelCompleter(QStringList additionalScriptLabels);
QStringList getGlobalScriptLabels();
void saveMapHealEvents(Map *map);