From ffe2ff964766a96462a8eeac1a632ea82f66fec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= <mwu-tow@gazeta.pl>
Date: Fri, 19 Jun 2009 01:01:43 +0000
Subject: [PATCH] Estates / hero bonuses won't give resources on first day.
---
server/CGameHandler.cpp | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index 330f1c4db..0dd5431be 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -671,22 +671,25 @@ void CGameHandler::newTurn()
n.heroes.insert(hth);
- switch(h->getSecSkillLevel(13)) //handle estates - give gold
+ if(gs->day) //not first day
{
- case 1: //basic
- r.res[6] += 125;
- break;
- case 2: //advanced
- r.res[6] += 250;
- break;
- case 3: //expert
- r.res[6] += 500;
- break;
- }
+ switch(h->getSecSkillLevel(13)) //handle estates - give gold
+ {
+ case 1: //basic
+ r.res[6] += 125;
+ break;
+ case 2: //advanced
+ r.res[6] += 250;
+ break;
+ case 3: //expert
+ r.res[6] += 500;
+ break;
+ }
- for(std::list<HeroBonus>::iterator i = h->bonuses.begin(); i != h->bonuses.end(); i++)
- if(i->type == HeroBonus::GENERATE_RESOURCE)
- r.res[i->subtype] += i->val;
+ for(std::list<HeroBonus>::iterator i = h->bonuses.begin(); i != h->bonuses.end(); i++)
+ if(i->type == HeroBonus::GENERATE_RESOURCE)
+ r.res[i->subtype] += i->val;
+ }
}
for(std::vector<CGTownInstance *>::iterator j=i->second.towns.begin();j!=i->second.towns.end();j++)//handle towns
{