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

Added "produce" section in "building" structure. Changed dailyIncome.

Browse Source
This commit is contained in:
Macron1Robot
2014-04-26 18:23:35 +04:00
parent 9123c7a787
commit 907caedb13
20 changed files with 200 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/CKingdomInterface.cpp
View File

@ -580,7 +580,8 @@ void CKingdomInterface::generateMinesList(const std::vector<const CGObjectInstan
std::vector<const CGTownInstance*> towns = LOCPLINT->cb->getTownsInfo(true);
for(auto & town : towns)
{
totalIncome += town->dailyIncome();
TResources income = town->dailyIncome();
totalIncome += income[Res::GOLD];
}
for (int i=0; i<7; i++)
{
@ -778,8 +779,8 @@ CTownItem::CTownItem(const CGTownInstance* Town):
OBJ_CONSTRUCTION_CAPTURING_ALL;
background = new CAnimImage("OVSLOT", 6);
name = new CLabel(74, 8, FONT_SMALL, TOPLEFT, Colors::WHITE, town->name);
income = new CLabel( 190, 60, FONT_SMALL, CENTER, Colors::WHITE, boost::lexical_cast<std::string>(town->dailyIncome()));
TResources townIncome = town->dailyIncome();
income = new CLabel(190, 60, FONT_SMALL, CENTER, Colors::WHITE, boost::lexical_cast<std::string>(townIncome[Res::GOLD]));
hall = new CTownInfo( 69, 31, town, true);
fort = new CTownInfo(111, 31, town, false);
@ -810,7 +811,8 @@ void CTownItem::updateGarrisons()
void CTownItem::update()
{
std::string incomeVal = boost::lexical_cast<std::string>(town->dailyIncome());
TResources townIncome = town->dailyIncome();
std::string incomeVal = boost::lexical_cast<std::string>(townIncome[Res::GOLD]);
if (incomeVal != income->text)
income->setText(incomeVal);