AlexVinS преди 9 години
родител
ревизия
04f7b4f951
променени са 2 файла, в които са добавени 2 реда и са изтрити 8 реда
  1. 2 7
      lib/HeroBonus.cpp
  2. 0 1
      lib/HeroBonus.h

+ 2 - 7
lib/HeroBonus.cpp

@@ -502,7 +502,7 @@ const TBonusListPtr IBonusBearer::getSpellBonuses() const
 const std::shared_ptr<Bonus> IBonusBearer::getEffect(ui16 id, int turn /*= 0*/) const
 {
 	//TODO should check only local bonuses?
-	auto bonuses = getAllBonuses();
+	auto bonuses = getAllBonuses(Selector::all, Selector::all);
 	for(auto & it : *bonuses)
 	{
 		if(it->source == Bonus::SPELL_EFFECT && it->sid == id)
@@ -514,14 +514,9 @@ const std::shared_ptr<Bonus> IBonusBearer::getEffect(ui16 id, int turn /*= 0*/)
 	return nullptr;
 }
 
-const TBonusListPtr IBonusBearer::getAllBonuses() const
-{
-	return getAllBonuses(Selector::all, Selector::all);
-}
-
 const std::shared_ptr<Bonus> IBonusBearer::getBonus(const CSelector &selector) const
 {
-	auto bonuses = getAllBonuses();
+	auto bonuses = getAllBonuses(Selector::all, Selector::all);
 	return bonuses->getFirst(selector);
 }
 

+ 0 - 1
lib/HeroBonus.h

@@ -585,7 +585,6 @@ public:
 	const TBonusListPtr getBonuses(const CSelector &selector, const CSelector &limit, const std::string &cachingStr = "") const;
 	const TBonusListPtr getBonuses(const CSelector &selector, const std::string &cachingStr = "") const;
 
-	const TBonusListPtr getAllBonuses() const;
 	const std::shared_ptr<Bonus> getBonus(const CSelector &selector) const; //returns any bonus visible on node that matches (or nullptr if none matches)
 
 	//legacy interface