Fix resource map creation with bc7 bitmap tags, bump to 0.53.2

SnowyMouse · Jul 20, 2023 · 80b3831 · 80b3831
1 parent 7215262
commit 80b3831
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 This is used for recording Invader's changes. This changelog is based on
 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.53.2] - 2023-07-20
+### Fixed
+- invader-resource: Fix creating resource maps for MCC CEA with BC7 bitmap tags in them.
+
 ## [0.53.1] - 2023-07-19
 ### Changed
 - invader: rename `use variant 2 for calculation bump attention` flag to `use alternate bump attenuation`
@@ -2492,5 +2496,6 @@ image as one bitmap
 [0.52.4]: https://github.com/SnowyMouse/invader/compare/0.52.3...0.52.4
 [0.53.0]: https://github.com/SnowyMouse/invader/compare/0.52.4...0.53.0
 [0.53.1]: https://github.com/SnowyMouse/invader/compare/0.53.0...0.53.1
+[0.53.1]: https://github.com/SnowyMouse/invader/compare/0.53.1...0.53.2
 
-[Untagged]: https://github.com/SnowyMouse/invader/compare/0.53.1...master
+[Untagged]: https://github.com/SnowyMouse/invader/compare/0.53.2...master
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.15)
 
 # Project name - You should change this if you're making a fork
 project(Invader
-    VERSION 0.53.1
+    VERSION 0.53.2
     DESCRIPTION "Modding toolkit for Halo Combat Evolved"
     LANGUAGES C CXX
 )

diff --git a/src/tag/parser/compile/bitmap/compile.cpp b/src/tag/parser/compile/bitmap/compile.cpp
@@ -163,7 +163,7 @@ namespace Invader::Parser {
                 }
             }
 
-            if(engine_target != HEK::CacheFileEngine::CACHE_FILE_MCC_CEA && data.format == HEK::BitmapDataFormat::BITMAP_DATA_FORMAT_BC7) {
+            if((engine_target != HEK::CacheFileEngine::CACHE_FILE_MCC_CEA && engine_target != HEK::CacheFileEngine::CACHE_FILE_NATIVE) && data.format == HEK::BitmapDataFormat::BITMAP_DATA_FORMAT_BC7) {
                 REPORT_ERROR_PRINTF(workload, ERROR_TYPE_ERROR, tag_index, "Bitmap data #%zu is BC7 which is not implemented by the target engine", b);
                 throw InvalidTagDataException();
             }