Skip to content

Commit

Permalink
Fix unintended merge
Browse files Browse the repository at this point in the history
  • Loading branch information
RecursiveVision committed Jun 9, 2024
1 parent 2fad896 commit 47d7865
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CvGameCoreDLL_Expansion2/CvGame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6555,7 +6555,7 @@ bool CvGame::CanPlayerAttemptDominationVictory(PlayerTypes ePlayer, PlayerTypes
return false;

// Already at war, but making peace with this player would stop us from eliminating everyone?
if (eMakePeacePlayer == kPlayer.GetID())
if (eMakePeacePlayer != NO_PLAYER && eMakePeacePlayer == kPlayer.GetID())
return false;
}
else
Expand Down

0 comments on commit 47d7865

Please sign in to comment.