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

fix error in script edit command

Browse source
This commit is contained in:
garakmon 2020-08-04 18:24:37 -04:00 committed by garak
parent 24f970628e
commit 2a11760afd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/core/editcommands.h
View file

@ -345,7 +345,7 @@ public:
void undo() override; void undo() override;
void redo() override; void redo() override;
bool mergeWith(const QUndoCommand *) override { return false; }; bool mergeWith(const QUndoCommand *) override { return false; }
int id() const override { return CommandId::ID_ScriptEditMap; } int id() const override { return CommandId::ID_ScriptEditMap; }
private: private:

12
src/core/editcommands.cpp
View file

@ -498,10 +498,10 @@ ScriptEditMap::ScriptEditMap(Map *map,
this->newMetatiles = newMetatiles; this->newMetatiles = newMetatiles;
this->oldMetatiles = oldMetatiles; this->oldMetatiles = oldMetatiles;
this->oldMapWidth = oldMapWidth; this->oldMapWidth = oldMapDimensions.width();
this->oldMapHeight = oldMapHeight; this->oldMapHeight = oldMapDimensions.height();
this->newMapWidth = newMapWidth; this->newMapWidth = newMapDimensions.width();
this->newMapHeight = newMapHeight; this->newMapHeight = newMapDimensions.height();
} }
ScriptEditMap::~ScriptEditMap() { ScriptEditMap::~ScriptEditMap() {
@ -517,7 +517,7 @@ void ScriptEditMap::redo() {
if (map->layout->blockdata) { if (map->layout->blockdata) {
map->layout->blockdata->copyFrom(newMetatiles); map->layout->blockdata->copyFrom(newMetatiles);
if (newMapWidth != map->getWidth() || newMapHeight != map->getHeight()) { if (newMapWidth != map->getWidth() || newMapHeight != map->getHeight()) {
map->setDimensions(newMapWidth, newMapHeight); map->setDimensions(newMapWidth, newMapHeight, false);
} }
} }
@ -533,7 +533,7 @@ void ScriptEditMap::undo() {
if (map->layout->blockdata) { if (map->layout->blockdata) {
map->layout->blockdata->copyFrom(oldMetatiles); map->layout->blockdata->copyFrom(oldMetatiles);
if (oldMapWidth != map->getWidth() || oldMapHeight != map->getHeight()) { if (oldMapWidth != map->getWidth() || oldMapHeight != map->getHeight()) {
map->setDimensions(oldMapWidth, oldMapHeight); map->setDimensions(oldMapWidth, oldMapHeight, false);
} }
} }