mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
Merge pull request #7341 from GeorgeK1ng/native_terrains
Add multiple nativeTerrains support
This commit is contained in:
@@ -139,15 +139,17 @@ std::vector<SlotInfo>::iterator ArmyManager::getBestUnitForScout(std::vector<Slo
|
||||
|
||||
if (terrainHasPenalty)
|
||||
{
|
||||
auto leftNativeTerrain = left.creature->getFactionID().toFaction()->nativeTerrain;
|
||||
auto rightNativeTerrain = right.creature->getFactionID().toFaction()->nativeTerrain;
|
||||
const auto leftFaction = left.creature->getFactionID().toFaction();
|
||||
const auto rightFaction = right.creature->getFactionID().toFaction();
|
||||
const bool leftIsNative = leftFaction->isNativeTerrain(armyTerrain);
|
||||
const bool rightIsNative = rightFaction->isNativeTerrain(armyTerrain);
|
||||
|
||||
if (leftNativeTerrain != rightNativeTerrain)
|
||||
if (leftIsNative != rightIsNative)
|
||||
{
|
||||
if (leftNativeTerrain == armyTerrain)
|
||||
if (leftIsNative)
|
||||
return true;
|
||||
|
||||
if (rightNativeTerrain == armyTerrain)
|
||||
if (rightIsNative)
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user