games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-09 23:42:03 +02:00
Code Issues Releases Activity

renamed & reused CBonusSystemNode::updateBonuses; tweaked updater signature

Browse Source
This commit is contained in:
Henning Koehler
2017-09-10 00:25:55 +12:00
parent 67330efa4a
commit f1fd00f005
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/HeroBonus.h
View File

@@ -485,6 +485,7 @@ public:
int valOfBonuses(const CSelector &select) const;
void eliminateDuplicates();
void updateBonuses(const CBonusSystemNode & node);
// remove_if implementation for STL vector types
template <class Predicate>
@@ -707,7 +708,9 @@ public:
///removes bonuses by selector
void popBonuses(const CSelector &s);
///updates count of remaining turns and removes outdated bonuses by selector
void updateBonuses(const CSelector &s);
void reduceBonusDurations(const CSelector &s);
//run update decorators
void updateBonuses();
virtual std::string bonusToString(const std::shared_ptr<Bonus>& bonus, bool description) const {return "";}; //description or bonus name
virtual std::string nodeName() const;
@@ -1013,16 +1016,10 @@ void BonusList::insert(const int position, InputIterator first, InputIterator la
// bonus decorators for updating bonuses based on events (e.g. hero gaining level)
struct BonusUpdateContext
{
std::shared_ptr<Bonus> b;
const CBonusSystemNode & node;
};
class DLL_LINKAGE IUpdater
{
public:
virtual void update(BonusUpdateContext & context) const = 0;
virtual void update(Bonus & b, const CBonusSystemNode & context) const = 0;
template <typename Handler> void serialize(Handler &h, const int version)
{
@@ -1041,5 +1038,5 @@ struct DLL_LINKAGE ScalingUpdater : public IUpdater
h & stepSize;
}
void update(BonusUpdateContext & context);
void update(Bonus & b, const CBonusSystemNode & context);
};