games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-27 21:49:10 +02:00
Code Issues Releases Activity

Merge pull request #5355 from IvanSavenko/hotfix

Browse Source 
Hotfix for 1.6.4
This commit is contained in:
Ivan Savenko 2025-01-31 14:09:28 +02:00 committed by GitHub
commit 89b703c7c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/vcmi-app/build.gradle
View File

@ -26,7 +26,7 @@ android {
minSdk = qtMinSdkVersion as Integer minSdk = qtMinSdkVersion as Integer
targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project targetSdk = qtTargetSdkVersion as Integer // ANDROID_TARGET_SDK_VERSION in the CMake project
versionCode 1640 versionCode 1642
versionName "1.6.4" versionName "1.6.4"
setProperty("archivesBaseName", "vcmi") setProperty("archivesBaseName", "vcmi")

4
lib/battle/BattleHexArray.cpp
View File

@ -32,9 +32,7 @@ void BattleHexArray::insert(const BattleHexArray & other) noexcept
void BattleHexArray::clear() noexcept void BattleHexArray::clear() noexcept
{ {
for(const auto & hex : internalStorage) presenceFlags = {};
presenceFlags[hex.toInt()] = false;
internalStorage.clear(); internalStorage.clear();
} }

4
lib/battle/BattleHexArray.h
View File

@ -126,7 +126,7 @@ public:
// reinit presence flags // reinit presence flags
presenceFlags = {}; presenceFlags = {};
for(const auto & hex : internalStorage) for(const auto & hex : internalStorage)
presenceFlags.set(hex.toInt()) = true; presenceFlags.set(hex.toInt());
} }
void shuffle(vstd::RNG & rand) void shuffle(vstd::RNG & rand)
@ -239,7 +239,7 @@ public:
if(!s.saving) if(!s.saving)
{ {
for(const auto & hex : internalStorage) for(const auto & hex : internalStorage)
presenceFlags.set(hex.toInt()) = true; presenceFlags.set(hex.toInt());
} }
} }