Author: silene
Date: Thu May 21 18:21:06 2009
New Revision: 35791
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35791&view=rev
Log:
Added a version of unit::get_abilities without the redundant location.
Modified:
trunk/src/actions.cpp
trunk/src/unit.hpp
trunk/src/unit_display.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=35791&r1=35790&r2=35791&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Thu May 21 18:21:06 2009
@@ -255,7 +255,7 @@
if(un == units.end()) {
return map_location::null_location;
}
- unit_ability_list abil = un->second.get_abilities("leadership",loc);
+ unit_ability_list abil = un->second.get_abilities("leadership");
if(bonus) {
*bonus = abil.highest("value").first;
}
@@ -1685,7 +1685,7 @@
std::string curing;
- unit_ability_list heal =
i->second.get_abilities("heals",i->first);
+ unit_ability_list heal = i->second.get_abilities("heals");
const bool is_poisoned =
i->second.get_state(unit::STATE_POISONED);
if(is_poisoned) {
@@ -1746,7 +1746,7 @@
}
if(i->second.side() == side) {
- unit_ability_list regen =
i->second.get_abilities("regenerate",i->first);
+ unit_ability_list regen =
i->second.get_abilities("regenerate");
unit_abilities::effect regen_effect(regen,0,false);
if(regen_effect.get_composite_value() > healing) {
healing = regen_effect.get_composite_value();
@@ -1976,7 +1976,7 @@
const unit_map::const_iterator itor =
units.find(locs[i]);
if(itor != units.end() &&
itor->second.get_ability_bool("illuminates",itor->first) &&
!itor->second.incapacitated()) {
- unit_ability_list illum =
itor->second.get_abilities("illuminates",itor->first);
+ unit_ability_list illum =
itor->second.get_abilities("illuminates");
unit_abilities::effect
illum_effect(illum,lighten,false);
int mod = illum_effect.get_composite_value();
if(mod + tod.lawful_bonus >
illum.highest("max_value").first) {
@@ -2301,7 +2301,7 @@
should_clear_stack = true;
moves_left = 0;
- unit_ability_list hides =
it->second.get_abilities("hides",it->first);
+ unit_ability_list hides =
it->second.get_abilities("hides");
std::vector<std::pair<const config *,
map_location> >::const_iterator hide_it = hides.cfgs.begin();
// we only use the first valid alert message
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=35791&r1=35790&r2=35791&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Thu May 21 18:21:06 2009
@@ -294,7 +294,9 @@
int swing_num =0) const;
bool get_ability_bool(const std::string& ability, const map_location&
loc) const;
- unit_ability_list get_abilities(const std::string& ability, const
map_location& loc) const;
+ unit_ability_list get_abilities(const std::string &ability, const
map_location& loc) const;
+ unit_ability_list get_abilities(const std::string &ability) const
+ { return get_abilities(ability, loc_); }
std::vector<std::string> ability_tooltips(const map_location& loc)
const;
std::vector<std::string> unit_ability_tooltips() const;
std::vector<std::string> get_ability_list() const;
Modified: trunk/src/unit_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_display.cpp?rev=35791&r1=35790&r2=35791&view=diff
==============================================================================
--- trunk/src/unit_display.cpp (original)
+++ trunk/src/unit_display.cpp Thu May 21 18:21:06 2009
@@ -277,8 +277,8 @@
unit_animator animator;
- unit_ability_list leaders = attacker.get_abilities("leadership",a);
- unit_ability_list helpers = defender.get_abilities("resistance",b);
+ unit_ability_list leaders = attacker.get_abilities("leadership");
+ unit_ability_list helpers = defender.get_abilities("resistance");
{
std::string text ;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
