From 3bbfee0e1ca31b2ece778c9dd1a59d4ee21c2250 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 31 Jan 2025 11:41:44 +0000 Subject: [PATCH 1/2] Fix usage of std::bitset --- lib/battle/BattleHexArray.cpp | 4 +--- lib/battle/BattleHexArray.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/battle/BattleHexArray.cpp b/lib/battle/BattleHexArray.cpp index bbe95051f..12a8d3857 100644 --- a/lib/battle/BattleHexArray.cpp +++ b/lib/battle/BattleHexArray.cpp @@ -32,9 +32,7 @@ void BattleHexArray::insert(const BattleHexArray & other) noexcept void BattleHexArray::clear() noexcept { - for(const auto & hex : internalStorage) - presenceFlags[hex.toInt()] = false; - + presenceFlags = {}; internalStorage.clear(); } diff --git a/lib/battle/BattleHexArray.h b/lib/battle/BattleHexArray.h index fa5c70e9f..cbad8602d 100644 --- a/lib/battle/BattleHexArray.h +++ b/lib/battle/BattleHexArray.h @@ -126,7 +126,7 @@ public: // reinit presence flags presenceFlags = {}; for(const auto & hex : internalStorage) - presenceFlags.set(hex.toInt()) = true; + presenceFlags.set(hex.toInt()); } void shuffle(vstd::RNG & rand) @@ -239,7 +239,7 @@ public: if(!s.saving) { for(const auto & hex : internalStorage) - presenceFlags.set(hex.toInt()) = true; + presenceFlags.set(hex.toInt()); } } From 172c03213c26837583c9d59308cd7a0210942f9d Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 31 Jan 2025 11:41:59 +0000 Subject: [PATCH 2/2] Build ID bump for Android --- android/vcmi-app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/vcmi-app/build.gradle b/android/vcmi-app/build.gradle index 39f24b975..d124db866 100644 --- a/android/vcmi-app/build.gradle +++ b/android/vcmi-app/build.gradle @@ -26,7 +26,7 @@ android { minSdk = qtMinSdkVersion as Integer targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project - versionCode 1640 + versionCode 1642 versionName "1.6.4" setProperty("archivesBaseName", "vcmi")