Author: silene
Date: Sat May 30 12:26:04 2009
New Revision: 35940
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35940&view=rev
Log:
Simplified interface of ai_stopunit_result.
Modified:
trunk/src/ai/ai_actions.cpp
trunk/src/ai/ai_actions.hpp
Modified: trunk/src/ai/ai_actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_actions.cpp?rev=35940&r1=35939&r2=35940&view=diff
==============================================================================
--- trunk/src/ai/ai_actions.cpp (original)
+++ trunk/src/ai/ai_actions.cpp Sat May 30 12:26:04 2009
@@ -565,23 +565,23 @@
{
}
-
-bool ai_stopunit_result::test_unit(unit_map::const_iterator& un, const
unit_map& units, bool /*update_knowledge*/)
-{
- un = units.find(unit_location_);
+const unit *ai_stopunit_result::get_unit(const unit_map &units, bool)
+{
+ unit_map::const_iterator un = units.find(unit_location_);
if (un==units.end()){
set_error(E_NO_UNIT);
- return false;
- }
- if (un->second.side()!=get_side()){
+ return NULL;
+ }
+ const unit *u = &un->second;
+ if (u->side() != get_side()) {
set_error(E_NOT_OWN_UNIT);
- return false;
- }
- if (un->second.incapacitated()){
+ return NULL;
+ }
+ if (u->incapacitated()) {
set_error(E_INCAPACITATED_UNIT);
- return false;
- }
- return true;
+ return NULL;
+ }
+ return u;
}
void ai_stopunit_result::do_check_before()
@@ -593,11 +593,8 @@
const unit_map& s_units = s_info.units;
const unit_map& units = info.units;
- unit_map::const_iterator s_unit;
- unit_map::const_iterator unit;
- if ( !test_unit(s_unit,s_units) ||
- ( is_execution() && using_subjective_info() &&
- !test_unit(unit,units,true) ) ){
+ if (!get_unit(s_units) || (is_execution() && using_subjective_info() &&
!get_unit(units, true)))
+ {
return;
}
Modified: trunk/src/ai/ai_actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_actions.hpp?rev=35940&r1=35939&r2=35940&view=diff
==============================================================================
--- trunk/src/ai/ai_actions.hpp (original)
+++ trunk/src/ai/ai_actions.hpp Sat May 30 12:26:04 2009
@@ -228,7 +228,7 @@
virtual void do_execute();
virtual void do_init_for_execution();
private:
- bool test_unit(unit_map::const_iterator& un, const unit_map& units,
bool update_knowledge = false );
+ const unit *get_unit(const unit_map &units, bool update_knowledge =
false);
const map_location& unit_location_;
const bool remove_movement_;
const bool remove_attacks_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
