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

Fix bug #9649: about the choice of the attack direction:

Browse source 
Now, use any hex without enemy as a possible attack origin, but if
non-empty propose the nearest one

Previously, non-empty hex was discared and the last empty one was used
to search the nearest.

(This make it work, but i will rename things later to better describe
this behavior)
This commit is contained in:
Ali El Gariani 2007-07-31 21:48:51 +00:00
parent a91a35231d
commit 6bcce9611c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mouse_events.cpp
View file

@ -745,6 +745,7 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse)
}
}
// the selected hex is always the best attack origin
if (new_hex == selected_hex_) {
last_empty_hex_ = new_hex;
}
@ -757,14 +758,15 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse)
(*gui_).highlight_hex(new_hex);
//see if we should show the normal cursor, the movement cursor, or
//the attack cursor
const unit_map::iterator selected_unit = find_unit(selected_hex_);
const unit_map::iterator mouseover_unit = find_unit(new_hex);
if (mouseover_unit == units_.end()) {
// we consider any hex without enemy as a possible attack origin,
// we will search later the nearest empty hex
if (mouseover_unit == units_.end() || !current_team().is_enemy(mouseover_unit->second.side())) {
last_empty_hex_ = new_hex;
}