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

Merge branch 'dev' into tileset-types

Browse Source
This commit is contained in:
GriffinR
2025-03-26 21:42:37 -04:00
committed by GitHub
parent f3b751f600 00d79f91fe
commit 5cd53be057
31 changed files with 431 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/core/map.h
View File

@@ -51,9 +51,6 @@ public:
void setLayout(Layout *layout);
Layout* layout() const { return m_layout; }
void setLayoutId(const QString &layoutId) { m_layoutId = layoutId; }
QString layoutId() const { return m_layoutId; }
int getWidth() const;
int getHeight() const;
int getBorderWidth() const;
@@ -109,7 +106,6 @@ public:
private:
QString m_name;
QString m_constantName;
QString m_layoutId;
QString m_sharedEventsMap = "";
QString m_sharedScriptsMap = "";
@@ -144,6 +140,7 @@ signals:
void openScriptRequested(QString label);
void connectionAdded(MapConnection*);
void connectionRemoved(MapConnection*);
void layoutChanged();
};
#endif // MAP_H

5
include/core/maplayout.h
View File

@@ -22,7 +22,6 @@ public:
static QString layoutConstantFromName(const QString &name);
bool loaded = false;
bool hasUnsavedDataChanges = false;
QString id;
@@ -141,9 +140,7 @@ private:
void setNewBorderDimensionsBlockdata(int newWidth, int newHeight);
signals:
void layoutChanged(Layout *layout);
//void modified();
void layoutDimensionsChanged(const QSize &size);
void dimensionsChanged(const QSize &size);
void needsRedrawing();
};

2
include/core/validator.h
View File

@@ -34,7 +34,7 @@ public:
QString prefix() const { return m_prefix; }
void setPrefix(const QString &prefix);
bool isValid(QString &input) const;
bool isValid(const QString &input) const;
private:
QString m_prefix;