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

Adjust block indent.

Browse source
This commit is contained in:
galegosimpatico 2017-10-01 14:02:19 +00:00 • committed by Jyrki Vesterinen
parent 45d69970a7
commit 640ffe42d4
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/mouse_events.cpp
View file

@ -304,37 +304,35 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse, bool update, m
* mouse cursor lands on a hex with unit in it.
*/
if(!preventing_units_highlight_) {
if(un->side() == side_num_) {
// unit is on our team, show path if the unit has one
const map_location go_to = un->get_goto();
if(board.map().on_board(go_to)) {
pathfind::marked_route route;
{ // start planned unit map scope
wb::future_map_if_active raii;
route = get_route(un.get(), go_to, current_team());
} // end planned unit map scope
gui().set_route(&route);
}
over_route_ = true;
if(un->side() == side_num_) {
// unit is on our team, show path if the unit has one
const map_location go_to = un->get_goto();
if(board.map().on_board(go_to)) {
pathfind::marked_route route;
{ // start planned unit map scope
wb::future_map_if_active raii;
route = get_route(un.get(), go_to, current_team());
} // end planned unit map scope
gui().set_route(&route);
wb::future_map_if_active raii;
current_paths_ = pathfind::paths(*un, false, true, viewing_team(), path_turns_);
} else {
// unit under cursor is not on our team
// Note: planned unit map must be activated after this is done,
// since the future state includes changes to units' movement.
unit_movement_resetter move_reset(*un);
wb::future_map_if_active raii;
current_paths_ = pathfind::paths(*un, false, true, viewing_team(), path_turns_);
}
over_route_ = true;
wb::future_map_if_active raii;
current_paths_ = pathfind::paths(*un, false, true, viewing_team(), path_turns_);
} else {
// unit under cursor is not on our team
// Note: planned unit map must be activated after this is done,
// since the future state includes changes to units' movement.
unit_movement_resetter move_reset(*un);
unselected_paths_ = true;
gui().highlight_reach(current_paths_);
wb::future_map_if_active raii;
current_paths_ = pathfind::paths(*un, false, true, viewing_team(), path_turns_);
}
unselected_paths_ = true;
gui().highlight_reach(current_paths_);
} // !preventing_units_highlight_
}
if(!un && preventing_units_highlight_) {