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

Add identifier config settings

Browse Source
This commit is contained in:
GriffinR
2023-12-18 02:19:12 -05:00
parent bfb827b736
commit 6d995cee9b
20 changed files with 439 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/map.h
View File

@@ -71,7 +71,7 @@ public:
QList<int> metatileLayerOrder;
QList<float> metatileLayerOpacity;
void setName(QString mapName);
static QString mapConstantFromName(QString mapName);
static QString mapConstantFromName(QString mapName, bool includePrefix = true);
int getWidth();
int getHeight();
int getBorderWidth();

4
include/core/parseutil.h
View File

@@ -54,8 +54,8 @@ public:
QString readCIncbin(const QString &text, const QString &label);
QMap<QString, QString> readCIncbinMulti(const QString &filepath);
QStringList readCIncbinArray(const QString &filename, const QString &label);
QMap<QString, int> readCDefinesByPrefix(const QString &filename, const QStringList &prefixes);
QMap<QString, int> readCDefinesByName(const QString &filename, const QStringList &defineNames);
QMap<QString, int> readCDefinesByPrefix(const QString &filename, QStringList prefixes);
QMap<QString, int> readCDefinesByName(const QString &filename, QStringList names);
QStringList readCDefineNames(const QString&, const QStringList&);
QMap<QString, QHash<QString, QString>> readCStructs(const QString &, const QString & = "", const QHash<int, QString> = { });
QList<QStringList> getLabelMacros(const QList<QStringList>&, const QString&);

9
include/core/regionmap.h
View File

@@ -21,7 +21,10 @@ class Project;
struct LayoutSquare
{
LayoutSquare() : map_section("MAPSEC_NONE"), x(-1), y(-1), has_map(false) {}
LayoutSquare() : x(-1), y(-1), has_map(false) {
const QString prefix = projectConfig.getIdentifier(ProjectIdentifier::define_map_section_prefix);
map_section = prefix + projectConfig.getIdentifier(ProjectIdentifier::define_map_section_empty);
}
QString map_section;
int x;
int y;
@@ -144,6 +147,10 @@ public:
void emitDisplay();
const QString section_prefix;
const QString default_map_section;
const QString count_map_section;
signals:
void mapNeedsDisplaying();