upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 15:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using a hotkey to reload during an attack no longer disables the mouse...

Browse Source 
...(http://www.wesnoth.org/forum/viewtopic.php?f=4&t=27616)
This commit is contained in:
Alexander van Gessel 2009-10-30 21:49:48 +01:00
parent 5d6a732d79
commit 8fb71d300e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@ -20,6 +20,9 @@ Version 1.7.7+svn:
* Fix a NULL pointer deferring in the hover code * Fix a NULL pointer deferring in the hover code
* WML engine: * WML engine:
* Added two array element lookup macros, LOOKUP_INDEX and LOOKUP_VALUE. * Added two array element lookup macros, LOOKUP_INDEX and LOOKUP_VALUE.
* Miscellaneous and bugfixes:
* Using a hotkey to reload during an attack no longer disables the mouse
(http://www.wesnoth.org/forum/viewtopic.php?f=4&t=27616)
Version 1.7.7: Version 1.7.7:
* AI: * AI:

4
src/mouse_events.cpp
View File

@ -787,10 +787,10 @@ void mouse_handler::perform_attack(
current_team().set_action_bonus_count(1 + current_team().action_bonus_count()); current_team().set_action_bonus_count(1 + current_team().action_bonus_count());
try { try {
events::command_disabler disabler; // Rather than decrementing for every possible exception, use RAII
commands_disabled--;
attack_unit(attacker_loc, defender_loc, attacker_weapon, defender_weapon); attack_unit(attacker_loc, defender_loc, attacker_weapon, defender_weapon);
commands_disabled--;
} catch(end_level_exception&) { } catch(end_level_exception&) {
commands_disabled--;
//if the level ends due to a unit being killed, still see if //if the level ends due to a unit being killed, still see if
//either the attacker or defender should advance //either the attacker or defender should advance
dialogs::advance_unit(attacker_loc); dialogs::advance_unit(attacker_loc);