Author: silene
Date: Thu May 21 18:21:13 2009
New Revision: 35792
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35792&view=rev
Log:
Added a version of unit::get_ability_bool without the redundant location.
Modified:
trunk/src/actions.cpp
trunk/src/ai/ai.cpp
trunk/src/ai/ai_attack.cpp
trunk/src/ai/contexts.cpp
trunk/src/ai/formula_ai.cpp
trunk/src/menu_events.cpp
trunk/src/mouse_events.cpp
trunk/src/play_controller.cpp
trunk/src/unit.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Thu May 21 18:21:13 2009
@@ -1975,7 +1975,9 @@
for(int i = 0; i != 7; ++i) {
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()) {
+ itor->second.get_ability_bool("illuminates") &&
+ !itor->second.incapacitated())
+ {
unit_ability_list illum =
itor->second.get_abilities("illuminates");
unit_abilities::effect
illum_effect(illum,lighten,false);
int mod = illum_effect.get_composite_value();
Modified: trunk/src/ai/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/ai/ai.cpp (original)
+++ trunk/src/ai/ai.cpp Thu May 21 18:21:13 2009
@@ -897,8 +897,8 @@
if(u.side() == get_side() &&
(u.max_hitpoints() - u.hitpoints() >=
game_config::poison_amount/2
|| u.get_state(unit::STATE_POISONED)) &&
- !u.get_ability_bool("regenerate",u_it->first)) {
-
+ !u.get_ability_bool("regenerate"))
+ {
// Look for the village which is the least vulnerable
to enemy attack.
typedef
std::multimap<location,location>::const_iterator Itor;
std::pair<Itor,Itor> it =
srcdst.equal_range(u_it->first);
Modified: trunk/src/ai/ai_attack.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_attack.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/ai/ai_attack.cpp (original)
+++ trunk/src/ai/ai_attack.cpp Thu May 21 18:21:13 2009
@@ -208,7 +208,7 @@
}
// No surround bonus if target is
skirmisher
- if
(!itor->second.get_ability_bool("skirmisker", itor->first))
+ if
(!itor->second.get_ability_bool("skirmisker"))
surround_bonus = 1.2;
}
Modified: trunk/src/ai/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/contexts.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/ai/contexts.cpp (original)
+++ trunk/src/ai/contexts.cpp Thu May 21 18:21:13 2009
@@ -453,7 +453,7 @@
srcdst.insert(trivial_mv);
dstsrc.insert(trivial_mv);
}
- const bool teleports =
un_it->second.get_ability_bool("teleport",un_it->first);
+ bool teleports = un_it->second.get_ability_bool("teleport");
res.insert(std::pair<map_location,paths>(
un_it->first,paths(get_info().map,units,
un_it->first,get_info().teams,false,teleports,
Modified: trunk/src/ai/formula_ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/formula_ai.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/ai/formula_ai.cpp (original)
+++ trunk/src/ai/formula_ai.cpp Thu May 21 18:21:13 2009
@@ -1937,7 +1937,8 @@
std::set<map_location> formula_ai::get_allowed_teleports(unit_map::iterator&
unit_it) const {
std::set<map_location> allowed_teleports;
- if(unit_it->second.get_ability_bool("teleport",unit_it->first)) {
+ if (unit_it->second.get_ability_bool("teleport"))
+ {
for(std::set<map_location>::const_iterator i =
current_team().villages().begin();
i != current_team().villages().end(); ++i) {
//if (viewing_team().is_enemy(unit_it->second.side()) &&
viewing_team().fogged(*i))
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Thu May 21 18:21:13 2009
@@ -1241,7 +1241,7 @@
!gui_->fogged(u->first) &&
!u->second.incapacitated() && !invisible)
{
const unit_movement_resetter
move_reset(u->second);
- const bool teleports =
u->second.get_ability_bool("teleport",u->first);
+ bool teleports =
u->second.get_ability_bool("teleport");
const paths& path = paths(map_,units_,
u->first,teams_,false,teleports,teams_[gui_->viewing_team()], 0,false,
ignore_units);
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Thu May 21 18:21:13 2009
@@ -221,7 +221,7 @@
//unit under cursor is not on our team,
highlight reach
unit_movement_resetter move_reset(un->second);
- const bool teleport =
un->second.get_ability_bool("teleport",un->first);
+ bool teleport =
un->second.get_ability_bool("teleport");
current_paths_ =
paths(map_,units_,new_hex,teams_,
false,teleport,viewing_team(),path_turns_);
gui().highlight_reach(current_paths_);
@@ -320,7 +320,8 @@
std::set<map_location> allowed_teleports;
- if(un->second.get_ability_bool("teleport",un->first)) {
+ if (un->second.get_ability_bool("teleport"))
+ {
// search all known empty friendly villages
for(std::set<map_location>::const_iterator i =
team.villages().begin();
i != team.villages().end(); ++i) {
@@ -458,7 +459,7 @@
// if it's not the unit's turn, we reset its moves
unit_movement_resetter move_reset(u->second, u->second.side()
!= side_num_);
- const bool teleport =
u->second.get_ability_bool("teleport",u->first);
+ bool teleport = u->second.get_ability_bool("teleport");
current_paths_ = paths(map_,units_,hex,teams_,
false,teleport,viewing_team(),path_turns_);
show_attack_options(u);
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Thu May 21 18:21:13 2009
@@ -770,7 +770,7 @@
const unit_map::iterator u =
mouse_handler_.selected_unit();
if(u != units_.end()) {
- const bool teleport =
u->second.get_ability_bool("teleport",u->first);
+ bool teleport =
u->second.get_ability_bool("teleport");
// if it's not the unit's turn, we reset its
moves
unit_movement_resetter move_reset(u->second,
u->second.side() != player_number_);
Modified: trunk/src/unit.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit.hpp?rev=35792&r1=35791&r2=35792&view=diff
==============================================================================
--- trunk/src/unit.hpp (original)
+++ trunk/src/unit.hpp Thu May 21 18:21:13 2009
@@ -294,6 +294,8 @@
int swing_num =0) const;
bool get_ability_bool(const std::string& ability, const map_location&
loc) const;
+ bool get_ability_bool(const std::string &ability) const
+ { return get_ability_bool(ability, loc_); }
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_); }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
