Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-27 18:36:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename 'Reset' actions to 'Clear', and add 'Clear Background Map' to edit history

Browse Source
This commit is contained in:
Marcus Huderle
2019-03-17 11:37:13 -05:00
parent 5b6f658e29
commit 8af714a681
5 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/regionmap.cpp
View File

@@ -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;
}

25
src/ui/regionmapeditor.cpp
View File

@@ -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;