games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Unified income handling, added IOwnableObject interface

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-24 20:42:19 +00:00
parent 189cb1c762
commit 0fd9dbf240
20 changed files with 116 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapObjects/CGTownInstance.cpp
View File

@@ -225,13 +225,16 @@ TResources CGTownInstance::dailyIncome() const
}
}
auto playerSettings = cb->gameState()->scenarioOps->getIthPlayersSettings(getOwner());
for(TResources::nziterator it(ret); it.valid(); it++)
// always round up income - we don't want to always produce zero if handicap in use
ret[it->resType] = vstd::divideAndCeil(ret[it->resType] * playerSettings.handicap.percentIncome, 100);
const auto & playerSettings = cb->getPlayerSettings(getOwner());
ret.applyHandicap(playerSettings->handicap.percentIncome);
return ret;
}
const IOwnableObject * CGTownInstance::asOwnable() const
{
return this;
}
bool CGTownInstance::hasFort() const
{
return hasBuilt(BuildingID::FORT);