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

Fix move+attack not interrupted if ambushed at destination.

Browse source 
Works by scanning adjacent enemies before and after move, so it could
detect other cases than simple ambush (WML events).
This commit is contained in:
Ali El Gariani 2010-07-29 01:02:16 +00:00
parent 68af18cd29
commit f758975358
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mouse_events.cpp
View file

@ -517,6 +517,11 @@ bool mouse_handler::left_click(int x, int y, const bool browse)
//register the mouse-UI waypoints into the unit's waypoints
u->waypoints() = waypoints_;
// store side, since u may be invalidated later
int side = u->side();
//record visible enemies adjacent to destination
std::set<map_location> adj_enemies = get_adj_enemies(attack_from, side);
// move the unit without clearing fog (to avoid interruption)
//TODO: clear fog and interrupt+resume move
if(!move_unit_along_current_route(false, true)) {
@ -526,6 +531,10 @@ bool mouse_handler::left_click(int x, int y, const bool browse)
return false;
}
//check if new enemies are now visible
if(get_adj_enemies(attack_from, side) != adj_enemies)
return false; //ambush, interrupt attack
attack_enemy(attack_from, hex, choice); // Fight !!
return false;
}
@ -966,11 +975,24 @@ void mouse_handler::perform_attack(
gui().draw();
}
std::set<map_location> mouse_handler::get_adj_enemies(const map_location& loc, int side) const
{
std::set<map_location> res;
const team& uteam = teams_[side-1];
map_location adj[6];
get_adjacent_tiles(loc, adj);
foreach (const map_location &aloc, adj) {
unit_map::const_iterator i = find_unit(aloc);
if (i != units_.end() && uteam.is_enemy(i->side()))
res.insert(aloc);
}
return res;
}
void mouse_handler::show_attack_options(const unit_map::const_iterator &u)
{
if (u == units_.end() || u->attacks_left() == 0)
return;
map_location adj[6];
get_adjacent_tiles(u->get_location(), adj);
foreach (const map_location &loc, adj)

3
src/mouse_events.hpp
View file

@ -108,6 +108,9 @@ protected:
void perform_attack(map_location attacker_loc, map_location defender_loc,
int attacker_weapon, int defender_weapon, rand_rng::seed_t seed);
//get visible ajacent enemies of 1-based side around location loc
std::set<map_location> get_adj_enemies(const map_location& loc, int side) const;
void show_attack_options(const unit_map::const_iterator &u);
map_location current_unit_attacks_from(const map_location& loc);
unit_map::const_iterator find_unit(const map_location& hex) const;