Subversion Repositories RAND

Compare Revisions

Ignore whitespace Rev 1082 → Rev 1083

/Rise of Mankind - A New Dawn/Assets/CvGameCoreDLL.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Rise of Mankind - A New Dawn/Assets/CvGameCoreDLL.dll.100civs
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Rise of Mankind - A New Dawn/Assets/Python/Contrib/CvModName.py
2,7 → 2,7
 
modName = "Rise of Mankind: A New Dawn"
displayName = "Rise of Mankind: A New Dawn"
modVersion = "2.2 (rev1082)"
modVersion = "2.2 (rev1083)"
 
civName = "BtS"
civVersion = "3.19"
/Sources/CvPlayer.cpp
36442,15 → 36442,15
FAssertMsg(eIndex1 < GC.getNumSpecialistInfos(), "eIndex1 is expected to be within maximum bounds (invalid Index)");
FAssertMsg(eIndex2 >= 0, "eIndex2 is expected to be non-negative (invalid Index)");
FAssertMsg(eIndex2 < NUM_YIELD_TYPES, "eIndex2 is expected to be within maximum bounds (invalid Index)");
bool bRecalc = false;
if (iChange != 0)
{
// bool bRecalc = false;
// if (iChange != 0)
// {
int iOldValue = getSpecialistYieldPercentChanges(eIndex1, eIndex2);
if (iOldValue != 0)
{
bRecalc = true;
}
// if (iOldValue != 0)
// {
// bRecalc = true;
// }
int iExistingValue = 0;
m_ppiSpecialistYieldPercentChanges[eIndex1][eIndex2] += iChange;
36459,15 → 36459,15
 
for (pLoopCity = firstCity(&iLoop); pLoopCity != NULL; pLoopCity = nextCity(&iLoop))
{
iExistingValue = (pLoopCity->getSpecialistCount(eIndex1) * (getSpecialistYieldPercentChanges(eIndex1, eIndex2)) - iOldValue) / 100;
iExistingValue = (pLoopCity->getFreeSpecialistCount(eIndex1) + pLoopCity->getSpecialistCount(eIndex1)) * (getSpecialistYieldPercentChanges(eIndex1, eIndex2) - iOldValue) / 100;
// set the new
pLoopCity->changeBaseYieldRate(eIndex2, iExistingValue);
}
}
if (bRecalc)
{
GC.getGameINLINE().recalculateModifiers();
}
// }
// if (bRecalc)
// {
// GC.getGameINLINE().recalculateModifiers();
// }
}
 
int CvPlayer::getFractionalCombatExperience() const