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

Convert usages of Blockdata pointers

Browse Source
This commit is contained in:
BigBahss
2021-02-14 16:34:17 -05:00
committed by huderlem
parent 42b56edc9d
commit f09e28f06c
14 changed files with 186 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/core/blockdata.h
View File

@@ -10,7 +10,7 @@
class Blockdata : public QVector<Block>
{
public:
QByteArray serialize();
QByteArray serialize() const;
};
#endif // BLOCKDATA_H

4
include/core/map.h
View File

@@ -75,8 +75,8 @@ public:
int getBorderHeight();
QPixmap render(bool ignoreCache, MapLayout * fromLayout = nullptr);
QPixmap renderCollision(qreal opacity, bool ignoreCache);
bool mapBlockChanged(int i, Blockdata * cache);
bool borderBlockChanged(int i, Blockdata * cache);
bool mapBlockChanged(int i, Blockdata cache);
bool borderBlockChanged(int i, Blockdata cache);
void cacheBlockdata();
void cacheCollision();
bool getBlock(int x, int y, Block *out);

12
include/core/maplayout.h
View File

@@ -24,15 +24,15 @@ public:
QString tileset_secondary_label;
Tileset *tileset_primary = nullptr;
Tileset *tileset_secondary = nullptr;
Blockdata *blockdata = nullptr;
Blockdata blockdata;
QImage border_image;
QPixmap border_pixmap;
Blockdata *border = nullptr;
Blockdata *cached_blockdata = nullptr;
Blockdata *cached_collision = nullptr;
Blockdata *cached_border = nullptr;
Blockdata border;
Blockdata cached_blockdata;
Blockdata cached_collision;
Blockdata cached_border;
struct {
Blockdata *blocks = nullptr;
Blockdata blocks;
QSize dimensions;
} lastCommitMapBlocks; // to track map changes
};

4
include/project.h
View File

@@ -91,7 +91,7 @@ public:
Tileset* getTileset(QString, bool forceLoad = false);
QMap<QString, QStringList> tilesetLabels;
Blockdata* readBlockdata(QString);
Blockdata readBlockdata(QString);
bool loadBlockdata(Map*);
void saveTextFile(QString path, QString text);
@@ -129,7 +129,7 @@ public:
void saveLayoutBlockdata(Map*);
void saveLayoutBorder(Map*);
void writeBlockdata(QString, Blockdata*);
void writeBlockdata(QString, const Blockdata &);
void saveAllMaps();
void saveMap(Map*);
void saveAllDataStructures();