0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AI: Fix assertion when trying to move to an off-map location

Browse source 
This could, for example, be triggered using ai.move().
This commit is contained in:
Celtic Minstrel 2021-08-15 12:09:48 -04:00 • committed by Celtic Minstrel
parent 644f5735da
commit 28d2ffae6a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ai/actions.cpp
View file

@ -377,8 +377,8 @@ bool move_result::test_route(const unit &un)
return false;
}
if (!to_.valid()) {
set_error(E_NO_ROUTE);
if (!to_.valid() || !resources::gameboard->map().on_board(to_)) {
set_error(E_OFF_MAP);
return false;
}
@ -1092,6 +1092,7 @@ const std::string& actions::get_error_name(int error_code)
error_names_.emplace(move_result::E_AMBUSHED, "move_result::E_AMBUSHED");
error_names_.emplace(move_result::E_FAILED_TELEPORT, "move_result::E_FAILED_TELEPORT");
error_names_.emplace(move_result::E_NO_ROUTE, "move_result::E_NO_ROUTE");
error_names_.emplace(move_result::E_OFF_MAP, "move_result::E_OFF_MAP");
error_names_.emplace(recall_result::E_NOT_AVAILABLE_FOR_RECALLING, "recall_result::E_NOT_AVAILABLE_FOR_RECALLING");
error_names_.emplace(recall_result::E_NO_GOLD, "recall_result::E_NO_GOLD");

1
src/ai/actions.hpp
View file

@ -175,6 +175,7 @@ public:
E_INCAPACITATED_UNIT = 2004,
E_AMBUSHED = 2005,
E_FAILED_TELEPORT = 2006,
E_OFF_MAP = 2007,
E_NO_ROUTE = 2008
};