upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 19:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and remove redundant code...

Browse Source 
...causing a sneaky super-ranged attack cheat using unit's end of turn key

spotted in the forum :
http://www.wesnoth.org/forum/viewtopic.php?t=17354 It is almost
existing in 1.2.6 too (you can see an attack cursor, but it select the
enemy instead of attacking)
This commit is contained in:
Ali El Gariani 2007-08-05 15:22:21 +00:00
parent 99ad847508
commit e1634e353a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mouse_events.cpp
View File

@ -1101,8 +1101,7 @@ void mouse_handler::left_click(const SDL_MouseButtonEvent& event, const bool bro
const gamemap::location& attack_from = current_unit_attacks_from(hex);
//see if we're trying to do a move-and-attack
if(!browse && !commands_disabled && u != units_.end() && u->second.attacks_left()>0 && enemy != units_.end() && !current_route_.steps.empty()) {
if(attack_from.valid()) {
if(!browse && !commands_disabled && u != units_.end() && u->second.attacks_left()>0 && enemy != units_.end() && attack_from.valid()) {
if(move_unit_along_current_route(false)) { //move the unit without updating shroud
// a WML event could have invalidated both attacker and defender
// so make sure they're valid before attacking
@ -1162,12 +1161,6 @@ void mouse_handler::left_click(const SDL_MouseButtonEvent& event, const bool bro
}
return;
}
}
//see if we're trying to attack an enemy
if(!commands_disabled && !browse && attack_from.valid()) {
attack_enemy(u,enemy);
}
//otherwise we're trying to move to a hex
@ -1223,7 +1216,7 @@ bool mouse_handler::move_unit_along_current_route(bool check_shroud)
{
const std::vector<gamemap::location> steps = current_route_.steps;
if(steps.empty()) {
return false;
return true;
}
const size_t moves = ::move_unit(gui_,gameinfo_,status_,map_,units_,teams_,