atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix PaintMetatile subclass issues

Browse source
This commit is contained in:
garakmon 2020-08-03 23:55:22 -04:00 committed by garak
parent d121701da0
commit d671470cb0
2 changed files with 10 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/core/editcommands.h
View file

@ -105,10 +105,11 @@ class BucketFillMetatile : public PaintMetatile {
public: public:
BucketFillMetatile(Map *map, BucketFillMetatile(Map *map,
Blockdata *oldMetatiles, Blockdata *newMetatiles, Blockdata *oldMetatiles, Blockdata *newMetatiles,
unsigned actionId, QUndoCommand *parent = nullptr); unsigned actionId, QUndoCommand *parent = nullptr)
~BucketFillMetatile(); : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
setText("Bucket Fill Metatiles");
}
bool mergeWith(const QUndoCommand *) override { return false; }
int id() const override { return CommandId::ID_BucketFillMetatile; } int id() const override { return CommandId::ID_BucketFillMetatile; }
}; };
@ -121,7 +122,7 @@ public:
BucketFillCollision(Map *map, BucketFillCollision(Map *map,
Blockdata *oldCollision, Blockdata *newCollision, Blockdata *oldCollision, Blockdata *newCollision,
QUndoCommand *parent = nullptr) QUndoCommand *parent = nullptr)
: PaintCollision(map, oldCollision, newCollision, -1, parent) { : PaintCollision(map, oldCollision, newCollision, -1, parent) {
setText("Flood Fill Collision"); setText("Flood Fill Collision");
} }
@ -137,11 +138,12 @@ class MagicFillMetatile : public PaintMetatile {
public: public:
MagicFillMetatile(Map *map, MagicFillMetatile(Map *map,
Blockdata *oldMetatiles, Blockdata *newMetatiles, Blockdata *oldMetatiles, Blockdata *newMetatiles,
unsigned actionId, QUndoCommand *parent = nullptr); unsigned actionId, QUndoCommand *parent = nullptr)
~MagicFillMetatile(); : PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
setText("Magic Fill Metatiles");
}
bool mergeWith(const QUndoCommand *) override { return false; } int id() const override { return CommandId::ID_MagicFillMetatile; }
int id() const override { return CommandId::ID_BucketFillMetatile; }
}; };

30
src/core/editcommands.cpp
View file

@ -116,36 +116,6 @@ void PaintBorder::undo() {
QUndoCommand::undo(); QUndoCommand::undo();
} }
/******************************************************************************
************************************************************************
******************************************************************************/
BucketFillMetatile::BucketFillMetatile(Map *map,
Blockdata *oldMetatiles, Blockdata *newMetatiles,
unsigned actionId, QUndoCommand *parent)
: PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
setText("Bucket Fill Metatiles");
}
BucketFillMetatile::~BucketFillMetatile() {
PaintMetatile::~PaintMetatile();
}
/******************************************************************************
************************************************************************
******************************************************************************/
MagicFillMetatile::MagicFillMetatile(Map *map,
Blockdata *oldMetatiles, Blockdata *newMetatiles,
unsigned actionId, QUndoCommand *parent)
: PaintMetatile(map, oldMetatiles, newMetatiles, actionId, parent) {
setText("Magic Fill Metatiles");
}
MagicFillMetatile::~MagicFillMetatile() {
PaintMetatile::~PaintMetatile();
}
/****************************************************************************** /******************************************************************************
************************************************************************ ************************************************************************
******************************************************************************/ ******************************************************************************/