diff --git a/CvGameCoreDLL_Expansion2/CvPlayer.cpp b/CvGameCoreDLL_Expansion2/CvPlayer.cpp index 888a465efd..4edf7c37aa 100644 --- a/CvGameCoreDLL_Expansion2/CvPlayer.cpp +++ b/CvGameCoreDLL_Expansion2/CvPlayer.cpp @@ -39965,12 +39965,12 @@ void CvPlayer::CheckForMonopoly(ResourceTypes eResource) bool bValid = false; if (GC.getGame().GetGreatestPlayerResourceMonopoly(eResource) == GetID()) { - if (((iOwnedNumResource * 100) / iTotalNumResource) >= iThreshold && ((iOwnedNumResource * 100) / iTotalNumResource) > GD_INT_GET(GLOBAL_RESOURCE_MONOPOLY_THRESHOLD)) + if ((iOwnedNumResource * 100 >= iTotalNumResource * iThreshold) && (iOwnedNumResource * 100 > iTotalNumResource * GD_INT_GET(GLOBAL_RESOURCE_MONOPOLY_THRESHOLD))) bValid = true; } else { - if (((iOwnedNumResource * 100) / iTotalNumResource) > iThreshold) + if (iOwnedNumResource * 100 > iTotalNumResource * iThreshold) bValid = true; } if (bValid) @@ -39995,7 +39995,7 @@ void CvPlayer::CheckForMonopoly(ResourceTypes eResource) else if(pkResourceInfo->getResourceUsage() == RESOURCEUSAGE_STRATEGIC) { //Do we have >25% of this resource under our control? - if(((iOwnedNumResource * 100) / iTotalNumResource) > GD_INT_GET(STRATEGIC_RESOURCE_MONOPOLY_THRESHOLD)) + if(iOwnedNumResource * 100 > iTotalNumResource * GD_INT_GET(STRATEGIC_RESOURCE_MONOPOLY_THRESHOLD)) { if(m_pabHasStrategicMonopoly[eResource] == false) { @@ -40019,12 +40019,12 @@ void CvPlayer::CheckForMonopoly(ResourceTypes eResource) bool bValid = false; if (GC.getGame().GetGreatestPlayerResourceMonopoly(eResource) == GetID()) { - if (((iOwnedNumResource * 100) / iTotalNumResource) >= iThreshold && ((iOwnedNumResource * 100) / iTotalNumResource) > GD_INT_GET(GLOBAL_RESOURCE_MONOPOLY_THRESHOLD)) + if ((iOwnedNumResource * 100 >= iTotalNumResource * iThreshold) && (iOwnedNumResource * 100 > iTotalNumResource * GD_INT_GET(GLOBAL_RESOURCE_MONOPOLY_THRESHOLD))) bValid = true; } else { - if (((iOwnedNumResource * 100) / iTotalNumResource) > iThreshold) + if (iOwnedNumResource * 100 > iTotalNumResource * iThreshold) bValid = true; }