Merge pull request #230 from Sebanisu/fix-skip-bgbtl_1-

Bug: Fix bgbtl_1 was getting skipped on swizzle batch operations.

Author: Sebanisu

.github/workflows/main-1.0.0.yaml

@@ -1,6 +1,6 @@
 name: Field-Map-Editor
 
-run-name: 1.0.4.${{ github.run_number }}
+run-name: 1.0.5.${{ github.run_number }}
 
 on:
   workflow_dispatch:
@@ -52,7 +52,7 @@ jobs:
       run: ".github/workflows/build.ps1"
       shell: pwsh
       env:
-        _BUILD_VERSION: "1.0.4.${{ github.run_number }}"
+        _BUILD_VERSION: "1.0.5.${{ github.run_number }}"
         GITHUB_PACKAGES_PAT: ${{ secrets.GITHUB_TOKEN }}
     - name: Upload vcpkg build logs
       if: failure()

.github/workflows/ubuntu.yaml

@@ -2,7 +2,7 @@
 # See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml
 name: Field-Map-Editor-linux
 
-run-name: 1.0.4.${{ github.run_number }}
+run-name: 1.0.5.${{ github.run_number }}
 
 on:
   workflow_dispatch:

CMakeLists.txt

@@ -23,7 +23,7 @@ endif()
 
 project(
   Field-Map-Editor
-  VERSION 1.0.4
+  VERSION 1.0.5
   LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD "23")

changelog.md

@@ -2,7 +2,7 @@
 
 All notable changes to the Field-Map-Editor project will be documented in this file, based on the available tags from the GitHub repository. Versions are sorted from the largest to the smallest number, with Canary representing the unreleased changes.
 
-## [canary] - To be 1.0.4
+## [canary] - To be 1.0.5
 
 [Release](https://github.com/Sebanisu/Field-Map-Editor/releases/tag/canary)
 

src/opengl/main/gui/batch.cpp

@@ -103,6 +103,7 @@ void fme::batch::draw_window()
                auto config = Configuration(config_path);
                config.save();
           }
+          spdlog::info("Batch operation completed.");
      }
      prev_disabled = disabled;
 
@@ -1425,6 +1426,7 @@ void fme::batch::button_start()
      {
           return;
      }
+     spdlog::info("Starting batch operation.");
      if (
        selections->get<ConfigKey::BatchOutputType>()
        == output_types::deswizzle_generate_toml)
@@ -2431,6 +2433,7 @@ void fme::batch::stop()
      m_field.reset();
      m_coo.reset();
      m_status.clear();
+     spdlog::info("Stopping batch operation.");
 }
 
 fme::batch::batch(

src/opengl/main/map_sprite.cpp

@@ -2437,15 +2437,6 @@ const ff_8::MapHistory::nsat_map &map_sprite::working_animation_counts() const
      // Adjust scale based on texture height or deswizzle state.
      std::int32_t height = static_cast<std::int32_t>(get_max_texture_height());
 
-     // If there’s only one bpp and at most one palette, nothing needs
-     // saving.
-     if (
-       unique_bpp.size() == 1U
-       && unique_values.palette().at(unique_bpp.front()).values().size() <= 1U)
-     {
-          return {};
-     }
-
      // Prepare for gathering palette conflicts.
      using map_type = std::remove_cvref_t<decltype(get_conflicting_palettes())>;
      using mapped_type                       = typename map_type::mapped_type;
@@ -2631,15 +2622,6 @@ const ff_8::MapHistory::nsat_map &map_sprite::working_animation_counts() const
        = ((256 * static_cast<std::int32_t>(max_texture_page_id)) + max_source_x)
          * m_render_framebuffer->scale();
 
-     // If there’s only one bpp and at most one palette, nothing needs
-     // saving.
-     if (
-       unique_bpp.size() == 1U
-       && unique_values.palette().at(unique_bpp.front()).values().size() <= 1U)
-     {
-          return {};
-     }
-
      // Prepare for gathering palette conflicts.
      const auto conflicting_palettes_map = get_conflicting_palettes();
      auto       conflicting_palettes_flatten

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "field-map-editor",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "builtin-baseline": "4334d8b4c8916018600212ab4dd4bbdc343065d1",
   "dependencies": [
     "lz4",