upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 19:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #16117: added a way to supress E_NOT_REACHED_DESTINATION...

Browse Source 
...to lua api via an optional boolean parameter -
ai.move_full(from,to_x,to_y,true) - this allows to steal units in
custom moveto events without the AI complaining that something is
wrong
This commit is contained in:
Iurii Chernyi 2011-08-10 21:35:16 +00:00
parent b5db06e075
commit 41cc607f65
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -1,4 +1,7 @@
Version 1.9.8+svn: Version 1.9.8+svn:
* AI:
* Fixed bug #16117: added a way to supress E_NOT_REACHED_DESTINATION to lua
api via an optional boolean parameter - ai.move_full(from,to_x,to_y,true)
* Campaigns: * Campaigns:
* Fixed remaining deprecation warnings about empty side= * Fixed remaining deprecation warnings about empty side=
* Language and i18n: * Language and i18n:

10
src/ai/actions.cpp
View File

@ -336,7 +336,7 @@ void attack_result::do_init_for_execution()
// move_result // move_result
move_result::move_result(side_number side, const map_location& from, move_result::move_result(side_number side, const map_location& from,
const map_location& to, bool remove_movement) const map_location& to, bool remove_movement, bool unreach_is_ok)
: action_result(side) : action_result(side)
, from_(from) , from_(from)
, move_spectator_(*resources::units) , move_spectator_(*resources::units)
@ -344,6 +344,7 @@ move_result::move_result(side_number side, const map_location& from,
, remove_movement_(remove_movement) , remove_movement_(remove_movement)
, route_() , route_()
, unit_location_(from) , unit_location_(from)
, unreach_is_ok_(unreach_is_ok)
{ {
} }
@ -434,7 +435,7 @@ void move_result::do_check_after()
} }
///@todo 1.9 add 'new units spotted' failure mode ///@todo 1.9 add 'new units spotted' failure mode
if (unit_location_!=to_) { if (!unreach_is_ok_ && unit_location_!=to_) {
set_error(E_NOT_REACHED_DESTINATION); set_error(E_NOT_REACHED_DESTINATION);
return; return;
} }
@ -1037,9 +1038,10 @@ move_result_ptr actions::execute_move_action( side_number side,
bool execute, bool execute,
const map_location& from, const map_location& from,
const map_location& to, const map_location& to,
bool remove_movement) bool remove_movement,
bool unreach_is_ok)
{ {
move_result_ptr action(new move_result(side,from,to,remove_movement)); move_result_ptr action(new move_result(side,from,to,remove_movement,unreach_is_ok));
execute ? action->execute() : action->check_before(); execute ? action->execute() : action->check_before();
return action; return action;

7
src/ai/actions.hpp
View File

@ -155,7 +155,8 @@ public:
move_result( side_number side, move_result( side_number side,
const map_location& from, const map_location& from,
const map_location& to, const map_location& to,
bool remove_movement ); bool remove_movement,
bool unreach_is_ok);
static const int E_EMPTY_MOVE = 2001; static const int E_EMPTY_MOVE = 2001;
static const int E_NO_UNIT = 2002; static const int E_NO_UNIT = 2002;
static const int E_NOT_OWN_UNIT = 2003; static const int E_NOT_OWN_UNIT = 2003;
@ -180,6 +181,7 @@ private:
bool remove_movement_; bool remove_movement_;
boost::shared_ptr<pathfind::plain_route> route_; boost::shared_ptr<pathfind::plain_route> route_;
map_location unit_location_; map_location unit_location_;
bool unreach_is_ok_;
}; };
@ -317,7 +319,8 @@ static move_result_ptr execute_move_action( side_number side,
bool execute, bool execute,
const map_location& from, const map_location& from,
const map_location& to, const map_location& to,
bool remove_movement ); bool remove_movement,
bool unreach_is_ok = false);

6
src/ai/lua/core.cpp
View File

@ -177,7 +177,11 @@ static int ai_execute_move(lua_State *L, bool remove_movement)
map_location from, to; map_location from, to;
if (!to_map_location(L, index, from)) goto error_call_destructors; if (!to_map_location(L, index, from)) goto error_call_destructors;
if (!to_map_location(L, index, to)) goto error_call_destructors; if (!to_map_location(L, index, to)) goto error_call_destructors;
ai::move_result_ptr move_result = ai::actions::execute_move_action(side,true,from,to,remove_movement); bool unreach_is_ok = false;
if (lua_isboolean(L, index)) {
unreach_is_ok = lua_toboolean(L, index);
}
ai::move_result_ptr move_result = ai::actions::execute_move_action(side,true,from,to,remove_movement, unreach_is_ok);
return transform_ai_action(L,move_result); return transform_ai_action(L,move_result);
} }