games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Bonus system: use duration helpers in selecters

Browse Source
This commit is contained in:
ArseniyShestakov 2015-11-20 13:24:48 +03:00
parent 6d395bcba7
commit f99ffbd074
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/HeroBonus.h
View File

@ -811,7 +811,7 @@ public:
bool operator()(const Bonus *bonus) const bool operator()(const Bonus *bonus) const
{ {
return turnsRequested <= 0 //every present effect will last zero (or "less") turns return turnsRequested <= 0 //every present effect will last zero (or "less") turns
|| !(bonus->duration & Bonus::N_TURNS) //so do every not expriing after N-turns effect || !Bonus::NTurns(bonus) //so do every not expriing after N-turns effect
|| bonus->turnsRemain > turnsRequested; || bonus->turnsRemain > turnsRequested;
} }
CWillLastTurns& operator()(const int &setVal) CWillLastTurns& operator()(const int &setVal)
@ -828,11 +828,11 @@ public:
bool operator()(const Bonus *bonus) const bool operator()(const Bonus *bonus) const
{ {
if(daysRequested <= 0 || bonus->duration & Bonus::PERMANENT || bonus->duration & Bonus::ONE_BATTLE) if(daysRequested <= 0 || Bonus::Permanent(bonus) || Bonus::OneBattle(bonus))
return true; return true;
else if(bonus->duration & Bonus::ONE_DAY) else if(Bonus::OneDay(bonus))
return false; return false;
else if(bonus->duration & Bonus::N_DAYS || bonus->duration & Bonus::ONE_WEEK) else if(Bonus::NDays(bonus) || Bonus::OneWeek(bonus))
{ {
return bonus->turnsRemain > daysRequested; return bonus->turnsRemain > daysRequested;
} }