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

Fix an old 1.2 bug:

Browse Source 
when moving next to an enemy, the unreachable zone mask was incorrect

according to ZoC (it didn't affect allowed moves, only the display)

It probably confused a lot of beginers who didn't know that when
moving next to lvl0 unit or with the skirmisher ability, you can move
again and are not forced to attack.

Note: I keep the old behavior, reselecting your unit when you move
next to an enemy
This commit is contained in:
Ali El Gariani 2007-08-07 15:56:06 +00:00
parent f3db0b75fd
commit 4eb321725c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mouse_events.cpp
View File

@ -1252,13 +1252,23 @@ bool mouse_handler::move_unit_along_current_route(bool check_shroud)
}
current_route_.steps.clear();
show_attack_options(u);
if(current_paths_.routes.empty() == false) {
current_paths_.routes[dst] = paths::route();
selected_hex_ = dst;
gui_->select_hex(dst);
gui_->highlight_reach(current_paths_);
//check if we are now adjacent to an enemy,
//we reselect the unit (old 1.2.x behavior)
gamemap::location adj[6];
get_adjacent_tiles(dst,adj);
for(int i = 0; i != 6; i++) {
unit_map::iterator adj_unit = find_unit(adj[i]);
if (adj_unit != units_.end() && current_team().is_enemy(adj_unit->second.side())) {
selected_hex_ = dst;
gui_->select_hex(dst);
const bool teleport = u->second.get_ability_bool("teleport",u->first);
current_paths_ = paths(map_,status_,gameinfo_,units_,dst,teams_,
false,teleport,viewing_team(),path_turns_);
show_attack_options(u);
gui_->highlight_reach(current_paths_);
break;
}
}
}