upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 16:46:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the AI detection of a unit actually moving.

Browse Source
This commit is contained in:
J. Tyne 2012-07-19 17:23:11 +00:00
parent 9e23b722f9
commit 17185a49b8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ai/actions.cpp
View File

@ -464,7 +464,7 @@ void move_result::do_execute()
move_spectator_.set_unit(resources::units->find(from_));
if (from_ != to_) {
move_unit(
size_t num_steps = move_unit(
/*move_unit_spectator* move_spectator*/ &move_spectator_,
/*std::vector<map_location> route*/ route_->steps,
/*replay* move_recorder*/ &recorder,
@ -473,13 +473,12 @@ void move_result::do_execute()
/*map_location *next_unit*/ NULL,
/*bool continue_move*/ true); ///@todo 1.9 set to false after implemeting interrupt awareness
if ( move_spectator_.get_ambusher().valid() || !move_spectator_.get_seen_enemies().empty() || !move_spectator_.get_seen_friends().empty() ) {
if ( num_steps > 0 ) {
set_gamestate_changed();
} else if ( move_spectator_.get_ambusher().valid() ) {
// Unlikely, but some types of strange WML (or bad pathfinding)
// could cause an ambusher to be found without moving.
set_gamestate_changed();
} else if (move_spectator_.get_unit().valid()){
unit_location_ = move_spectator_.get_unit()->get_location();
if (unit_location_ != from_) {
set_gamestate_changed();
}
}
} else {
assert(remove_movement_);