Author: alink
Date: Tue Jun 17 16:35:07 2008
New Revision: 27256
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27256&view=rev
Log:
Backport the fix for bug #11630
(preventing redo and rename during opponent's turn)
Modified:
branches/1.4/changelog
branches/1.4/src/play_controller.cpp
Modified: branches/1.4/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/changelog?rev=27256&r1=27255&r2=27256&view=diff
==============================================================================
--- branches/1.4/changelog (original)
+++ branches/1.4/changelog Tue Jun 17 16:35:07 2008
@@ -1,3 +1,7 @@
+Version 1.4.3+svn:
+ * miscellaneous and bug fixes:
+ * fix bug #11630 (preventing redo and rename during opponent's turn)
+
Version 1.4.3:
* campaigns:
* The Rise of Wesnoth:
Modified: branches/1.4/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/play_controller.cpp?rev=27256&r1=27255&r2=27256&view=diff
==============================================================================
--- branches/1.4/src/play_controller.cpp (original)
+++ branches/1.4/src/play_controller.cpp Tue Jun 17 16:35:07 2008
@@ -556,15 +556,15 @@
return network::nconnections() > 0;
case hotkey::HOTKEY_REDO:
- return !linger_ && !redo_stack_.empty() &&
!events::commands_disabled;
+ return !linger_ && !redo_stack_.empty() &&
!events::commands_disabled && !browse_;
case hotkey::HOTKEY_UNDO:
- return !linger_ && !undo_stack_.empty() &&
!events::commands_disabled;
+ return !linger_ && !undo_stack_.empty() &&
!events::commands_disabled && !browse_;
case hotkey::HOTKEY_UNIT_DESCRIPTION:
return menu_handler_.current_unit(mouse_handler_) !=
units_.end();
case hotkey::HOTKEY_RENAME_UNIT:
- return !events::commands_disabled &&
+ return !events::commands_disabled && !browse_ &&
menu_handler_.current_unit(mouse_handler_) !=
units_.end() &&
!(menu_handler_.current_unit(mouse_handler_)->second.unrenamable()) &&
menu_handler_.current_unit(mouse_handler_)->second.side() ==
gui_->viewing_team()+1 &&
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
