From f99ffbd074986431600d6e31d6f4f5cea22df86c Mon Sep 17 00:00:00 2001 From: ArseniyShestakov Date: Fri, 20 Nov 2015 13:24:48 +0300 Subject: [PATCH] Bonus system: use duration helpers in selecters --- lib/HeroBonus.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/HeroBonus.h b/lib/HeroBonus.h index 10b140746..2121263de 100644 --- a/lib/HeroBonus.h +++ b/lib/HeroBonus.h @@ -811,7 +811,7 @@ public: bool operator()(const Bonus *bonus) const { 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; } CWillLastTurns& operator()(const int &setVal) @@ -828,11 +828,11 @@ public: 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; - else if(bonus->duration & Bonus::ONE_DAY) + else if(Bonus::OneDay(bonus)) 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; }