Merge branch 'dev' of https://github.com/huderlem/porymap into local-id

include/core/map.h

@@ -22,10 +22,6 @@
 #define MAX_BORDER_WIDTH 255
 #define MAX_BORDER_HEIGHT 255
 
-// Number of metatiles to draw out from edge of map. Could allow modification of this in the future.
-// porymap will reflect changes to it, but the value is hard-coded in the projects at the moment
-#define BORDER_DISTANCE 7
-
 class LayoutPixmapItem;
 class CollisionPixmapItem;
 class BorderMetatilesPixmapItem;
@@ -89,6 +85,7 @@ public:
 
     void deleteConnections();
     QList<MapConnection*> getConnections() const { return m_connections; }
+    MapConnection* getConnection(const QString &direction) const;
     void removeConnection(MapConnection *);
     void addConnection(MapConnection *);
     void loadConnection(MapConnection *);

include/core/maplayout.h

@@ -96,8 +96,8 @@ public:
     int getHeight() const { return height; }
     int getBorderWidth() const { return border_width; }
     int getBorderHeight() const { return border_height; }
-    int getBorderDrawWidth() const;
-    int getBorderDrawHeight() const;
+    QMargins getBorderMargins() const;
+    QRect getVisibleRect() const;
 
     bool isWithinBounds(int x, int y) const;
     bool isWithinBounds(const QRect &rect) const;
@@ -116,9 +116,12 @@ public:
     void clearBorderCache();
     void cacheBorder();
 
-    void setClean();
     bool hasUnsavedChanges() const;
 
+    bool save(const QString &root);
+    bool saveBorder(const QString &root);
+    bool saveBlockdata(const QString &root);
+
     bool layoutBlockChanged(int i, const Blockdata &cache);
 
     uint16_t getBorderMetatileId(int x, int y);
@@ -143,6 +146,7 @@ public:
 private:
     void setNewDimensionsBlockdata(int newWidth, int newHeight);
     void setNewBorderDimensionsBlockdata(int newWidth, int newHeight);
+    bool writeBlockdata(const QString &path, const Blockdata &blockdata) const;
 
     static int getBorderDrawDistance(int dimension, qreal minimum);
 

include/core/paletteutil.h

@@ -7,7 +7,7 @@
 
 namespace PaletteUtil {
     QList<QRgb> parse(QString filepath, bool *error);
-    void writeJASC(QString filepath, QVector<QRgb> colors, int offset, int nColors);
+    bool writeJASC(const QString &filepath, const QVector<QRgb> &colors, int offset, int nColors);
 }
 
 #endif // PALETTEUTIL_H

include/core/tileset.h

@@ -55,17 +55,17 @@ public:
     static QString getExpectedDir(QString tilesetName, bool isSecondary);
     QString getExpectedDir();
 
-    void load();
-    void loadMetatiles();
-    void loadMetatileAttributes();
-    void loadTilesImage(QImage *importedImage = nullptr);
-    void loadPalettes();
+    bool load();
+    bool loadMetatiles();
+    bool loadMetatileAttributes();
+    bool loadTilesImage(QImage *importedImage = nullptr);
+    bool loadPalettes();
 
-    void save();
-    void saveMetatileAttributes();
-    void saveMetatiles();
-    void saveTilesImage();
-    void savePalettes();
+    bool save();
+    bool saveMetatileAttributes();
+    bool saveMetatiles();
+    bool saveTilesImage();
+    bool savePalettes();
 
     bool appendToHeaders(QString root, QString friendlyName, bool usingAsm);
     bool appendToGraphics(QString root, QString friendlyName, bool usingAsm);

include/core/utility.h

@@ -9,6 +9,7 @@ namespace Util {
     int roundUp(int numToRound, int multiple);
     QString toDefineCase(QString input);
     QString toHexString(uint32_t value, int minLength = 0);
+    QString toHtmlParagraph(const QString &text);
     Qt::Orientations getOrientation(bool xflip, bool yflip);
 }