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

Merge pull request #5248 from vcmi/master

Browse Source 
Merge master -> beta
This commit is contained in:
Ivan Savenko 2025-01-10 14:53:34 +02:00 committed by GitHub
commit b2331fb069
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 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 1630 versionCode 1632
versionName "1.6.3" versionName "1.6.3"
setProperty("archivesBaseName", "vcmi") setProperty("archivesBaseName", "vcmi")

2
lib/pathfinder/TurnInfo.cpp
View File

@ -137,7 +137,7 @@ TurnInfo::TurnInfo(TurnInfoCache * sharedCache, const CGHeroInstance * target, i
} }
{ {
static const CSelector selector = Selector::typeSubtype(BonusType::MOVEMENT, BonusCustomSubtype::heroMovementSea); static const CSelector selector = Selector::typeSubtype(BonusType::MOVEMENT, BonusCustomSubtype::heroMovementLand);
const auto & vectorLand = target->cb->getSettings().getValue(EGameSettings::HEROES_MOVEMENT_POINTS_LAND).Vector(); const auto & vectorLand = target->cb->getSettings().getValue(EGameSettings::HEROES_MOVEMENT_POINTS_LAND).Vector();
const auto & bonuses = sharedCache->movementPointsLimitLand.getBonusList(target, selector); const auto & bonuses = sharedCache->movementPointsLimitLand.getBonusList(target, selector);
int baseMovementPointsLand; int baseMovementPointsLand;