From 83c119baa3a588bdbd84f414d812e4dbede496b7 Mon Sep 17 00:00:00 2001 From: Nekaida Date: Sat, 1 Apr 2017 10:41:20 +0200 Subject: [PATCH 1/5] Change window title of settings and tileset editor --- resources/UI/SettingsDialog.ui | 2 +- resources/UI/TilesetDialog.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/UI/SettingsDialog.ui b/resources/UI/SettingsDialog.ui index 17aa1bc..992bb9a 100644 --- a/resources/UI/SettingsDialog.ui +++ b/resources/UI/SettingsDialog.ui @@ -11,7 +11,7 @@ - Dialog + Settings diff --git a/resources/UI/TilesetDialog.ui b/resources/UI/TilesetDialog.ui index bcd92eb..b8cca0d 100644 --- a/resources/UI/TilesetDialog.ui +++ b/resources/UI/TilesetDialog.ui @@ -11,7 +11,7 @@ - Dialog + Tileset Editor false From a153578f84d5d418ce740bf36dfecf9b18b4e399 Mon Sep 17 00:00:00 2001 From: Nekaida Date: Wed, 5 Apr 2017 00:39:14 +0200 Subject: [PATCH 2/5] Fix small copy and paste error --- src/Forms/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Forms/MainWindow.cpp b/src/Forms/MainWindow.cpp index b0039ce..673ad42 100644 --- a/src/Forms/MainWindow.cpp +++ b/src/Forms/MainWindow.cpp @@ -1020,7 +1020,7 @@ namespace ame MapHeader header; header.read(m_Rom, offset); if (header.primary()->image()->raw().isEmpty() || - header.primary()->image()->raw().isEmpty()) + header.secondary()->image()->raw().isEmpty()) { // Tilesets invalid, abort Messages::showMessage(this, "Layout says: \"I don't want to load tilesets!\""); From 4d09fb8fc89178b7a698f94914256b0f28db3509 Mon Sep 17 00:00:00 2001 From: Nekaida Date: Sun, 16 Apr 2017 21:05:45 +0200 Subject: [PATCH 3/5] Fix function doc description --- include/AME/Widgets/Rendering/AMEMapView.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/AME/Widgets/Rendering/AMEMapView.h b/include/AME/Widgets/Rendering/AMEMapView.h index e3b8d06..af42995 100644 --- a/include/AME/Widgets/Rendering/AMEMapView.h +++ b/include/AME/Widgets/Rendering/AMEMapView.h @@ -120,7 +120,7 @@ namespace ame bool movementMode() const; /////////////////////////////////////////////////////////// - /// \brief Retrieves the primary blockset size. + /// \brief Retrieves the main map position. /// /////////////////////////////////////////////////////////// QPoint mainPos(); From 1b4eaf444ee879311284469aeae3d4c7ee1e65ff Mon Sep 17 00:00:00 2001 From: Nekaida Date: Tue, 16 May 2017 18:47:53 +0200 Subject: [PATCH 4/5] Fix show grid buttons --- src/Forms/MainWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Forms/MainWindow.cpp b/src/Forms/MainWindow.cpp index 673ad42..d8bec1a 100644 --- a/src/Forms/MainWindow.cpp +++ b/src/Forms/MainWindow.cpp @@ -2048,11 +2048,13 @@ namespace ame // Function type: Helper // Contributors: Diegoisawesome, Nekaida // Last edit by: Nekaida - // Date of edit: 3/26/2017 + // Date of edit: 5/16/2017 // /////////////////////////////////////////////////////////// void MainWindow::toggle_grid(bool checked) { + ui->btnMapGrid->setChecked(checked); + ui->btnEntitiesGrid->setChecked(checked); ui->glMapEditor->setGridVisible(checked); ui->glBlockEditor->setGridVisible(checked); ui->glEntityEditor->setGridVisible(checked); From a02431bb828104631dc180addd3056bd713a215f Mon Sep 17 00:00:00 2001 From: Nekaida Date: Wed, 14 Jun 2017 22:52:59 +0200 Subject: [PATCH 5/5] Implement ROM reload --- include/AME/Forms/MainWindow.h | 1 + src/Forms/MainWindow.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/AME/Forms/MainWindow.h b/include/AME/Forms/MainWindow.h index d5c272c..9ecc1fc 100644 --- a/include/AME/Forms/MainWindow.h +++ b/include/AME/Forms/MainWindow.h @@ -192,6 +192,7 @@ namespace ame void setScriptEditorButtonsEnabled(bool enabled); void on_action_Open_ROM_triggered(); + void on_action_Reload_ROM_triggered(); void on_sldWildGrassChance_valueChanged(int value); void on_sldWildWaterChance_valueChanged(int value); void on_sldWildFishingChance_valueChanged(int value); diff --git a/src/Forms/MainWindow.cpp b/src/Forms/MainWindow.cpp index d8bec1a..10342fa 100644 --- a/src/Forms/MainWindow.cpp +++ b/src/Forms/MainWindow.cpp @@ -936,6 +936,19 @@ namespace ame loadMapData(); } + /////////////////////////////////////////////////////////// + // Function type: Slot + // Contributors: Nekaida + // Last edit by: Nekaida + // Date of edit: 6/14/2017 + // + /////////////////////////////////////////////////////////// + void MainWindow::on_action_Reload_ROM_triggered() + { + if(loadROM(m_Rom.info().path())) + loadMapData(); + } + /////////////////////////////////////////////////////////// // Function type: Slot // Contributors: Pokedude