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

Selecting another unit during a unit's move never fired the select event.

Browse source 
Fix this by firing it at the end of the first unit's move, this also triggers
select animation and sound at that time.
This commit is contained in:
Ali El Gariani 2009-03-01 17:28:48 +00:00
parent 468ba56c56
commit e90de3eaf8
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mouse_events.cpp
View file

@ -411,13 +411,20 @@ bool mouse_handler::left_click(int x, int y, const bool browse)
gui().unhighlight_reach();
move_unit_along_current_route(check_shroud);
// during the move, we may have selected another unit
// (but without triggering a select event (command was disabled)
// in that case reselect it now to fire the event (+ anim & sound)
if (selected_hex_ != src) {
select_hex(selected_hex_, browse);
}
return false;
} else if (!attackmove_) {
// we select a (maybe empty) hex
// we block selection during attack+move (because motion is blocked)
// FIXME: deal with selected event when commands_disabled
select_hex(hex, browse);
}
return false;
//FIXME: clean all these "return false"
}
void mouse_handler::select_hex(const map_location& hex, const bool browse) {
@ -447,7 +454,6 @@ void mouse_handler::select_hex(const map_location& hex, const bool browse) {
if (!browse && !commands_disabled && u->second.side() == gui().viewing_team()+1) {
sound::play_UI_sound("select-unit.wav");
u->second.set_selecting(gui(), u->first);
game_events::fire("select", hex);
}