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

fix "transport artifact" victory condition triggering as

Browse Source 
victory for human players even when artifact was transported by enemy AI
if "standard victory" is also enabled
This commit is contained in:
Ivan Savenko 2024-12-10 11:17:26 +00:00
parent 641c59a1a9
commit b0d8068493
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/gameState/CGameState.cpp
View File

@ -1400,8 +1400,10 @@ bool CGameState::checkForVictory(const PlayerColor & player, const EventConditio
case EventCondition::TRANSPORT: case EventCondition::TRANSPORT:
{ {
const auto * t = getTown(condition.objectID); const auto * t = getTown(condition.objectID);
return (t->visitingHero && t->visitingHero->getOwner() == player && t->visitingHero->hasArt(condition.objectType.as<ArtifactID>())) || bool garrisonedWon = t->garrisonHero && t->garrisonHero->getOwner() == player && t->garrisonHero->hasArt(condition.objectType.as<ArtifactID>());
(t->garrisonHero && t->garrisonHero->getOwner() == player && t->garrisonHero->hasArt(condition.objectType.as<ArtifactID>())); bool visitingWon = t->visitingHero && t->visitingHero->getOwner() == player && t->visitingHero->hasArt(condition.objectType.as<ArtifactID>());
return garrisonedWon || visitingWon;
} }
case EventCondition::DAYS_PASSED: case EventCondition::DAYS_PASSED:
{ {
@ -1436,6 +1438,9 @@ PlayerColor CGameState::checkForStandardWin() const
TeamID winnerTeam = TeamID::NO_TEAM; TeamID winnerTeam = TeamID::NO_TEAM;
for(const auto & elem : players) for(const auto & elem : players)
{ {
if(elem.second.status == EPlayerStatus::WINNER)
return elem.second.color;
if(elem.second.status == EPlayerStatus::INGAME && elem.first.isValidPlayer()) if(elem.second.status == EPlayerStatus::INGAME && elem.first.isValidPlayer())
{ {
if(supposedWinner == PlayerColor::NEUTRAL) if(supposedWinner == PlayerColor::NEUTRAL)