diff --git a/forms/regionmapeditor.ui b/forms/regionmapeditor.ui
index 0cba8783..acd7ceb9 100644
--- a/forms/regionmapeditor.ui
+++ b/forms/regionmapeditor.ui
@@ -61,8 +61,8 @@
0
0
- 350
- 225
+ 384
+ 249
@@ -182,8 +182,8 @@
0
0
- 350
- 225
+ 384
+ 249
@@ -330,10 +330,10 @@
- 8
+ 0
0
- 278
- 262
+ 283
+ 275
@@ -651,8 +651,8 @@
0
0
- 441
- 230
+ 412
+ 249
@@ -785,10 +785,10 @@
- 8
+ 0
0
- 255
- 274
+ 295
+ 283
@@ -1076,7 +1076,7 @@
0
0
829
- 22
+ 21
diff --git a/include/core/regionmap.h b/include/core/regionmap.h
index 96838fc7..7300cc60 100644
--- a/include/core/regionmap.h
+++ b/include/core/regionmap.h
@@ -70,8 +70,8 @@ public:
void resize(int width, int height);
void resetSquare(int index);
- void resetLayout();
- void resetImage();
+ void clearLayout();
+ void clearImage();
void replaceSectionId(unsigned oldId, unsigned newId);
int width();
diff --git a/include/ui/regionmapeditor.h b/include/ui/regionmapeditor.h
index 1d8301e1..b057adaf 100644
--- a/include/ui/regionmapeditor.h
+++ b/include/ui/regionmapeditor.h
@@ -92,8 +92,8 @@ private slots:
void on_action_RegionMap_Undo_triggered();
void on_action_RegionMap_Redo_triggered();
void on_action_RegionMap_Resize_triggered();
- void on_action_RegionMap_ResetImage_triggered();
- void on_action_RegionMap_ResetLayout_triggered();
+ void on_action_RegionMap_ClearImage_triggered();
+ void on_action_RegionMap_ClearLayout_triggered();
void on_action_Swap_triggered();
void on_action_RegionMap_Generate_triggered();
void on_tabWidget_Region_Map_currentChanged(int);
diff --git a/src/core/regionmap.cpp b/src/core/regionmap.cpp
index 41212fa1..3f376102 100644
--- a/src/core/regionmap.cpp
+++ b/src/core/regionmap.cpp
@@ -198,12 +198,12 @@ void RegionMap::resetSquare(int index) {
this->map_squares[index].duplicated = false;
}
-void RegionMap::resetLayout() {
+void RegionMap::clearLayout() {
for (int i = 0; i < map_squares.size(); i++)
resetSquare(i);
}
-void RegionMap::resetImage() {
+void RegionMap::clearImage() {
for (int i = 0; i < map_squares.size(); i++)
this->map_squares[i].tile_img_id = 0x00;
}
diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp
index fa2ef5c0..b3e7de19 100644
--- a/src/ui/regionmapeditor.cpp
+++ b/src/ui/regionmapeditor.cpp
@@ -597,25 +597,18 @@ void RegionMapEditor::on_action_Swap_triggered() {
}
}
-void RegionMapEditor::on_action_RegionMap_ResetImage_triggered() {
- QMessageBox::StandardButton result = QMessageBox::question(
- this,
- "WARNING",
- "This action will reset the entire map image to metatile 0x00, continue?",
- QMessageBox::Yes | QMessageBox::Cancel,
- QMessageBox::Yes
+void RegionMapEditor::on_action_RegionMap_ClearImage_triggered() {
+ this->region_map->clearImage();
+ RegionMapHistoryItem *commit = new RegionMapHistoryItem(
+ RegionMapEditorBox::BackgroundImage, this->region_map->getTiles(), this->region_map->width(), this->region_map->height()
);
+ history.push(commit);
- if (result == QMessageBox::Yes) {
- this->region_map->resetImage();
- displayRegionMapImage();
- displayRegionMapLayout();
- } else {
- return;
- }
+ displayRegionMapImage();
+ displayRegionMapLayout();
}
-void RegionMapEditor::on_action_RegionMap_ResetLayout_triggered() {
+void RegionMapEditor::on_action_RegionMap_ClearLayout_triggered() {
QMessageBox::StandardButton result = QMessageBox::question(
this,
"WARNING",
@@ -625,7 +618,7 @@ void RegionMapEditor::on_action_RegionMap_ResetLayout_triggered() {
);
if (result == QMessageBox::Yes) {
- this->region_map->resetLayout();
+ this->region_map->clearLayout();
displayRegionMapLayout();
} else {
return;