Author: soliton
Date: Fri Oct 17 22:38:49 2008
New Revision: 30236
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30236&view=rev
Log:
* allow out-of-turn unit renaming again
Modified:
branches/1.4/src/play_controller.cpp
Modified: branches/1.4/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/play_controller.cpp?rev=30236&r1=30235&r2=30236&view=diff
==============================================================================
--- branches/1.4/src/play_controller.cpp (original)
+++ branches/1.4/src/play_controller.cpp Fri Oct 17 22:38:49 2008
@@ -564,7 +564,7 @@
return menu_handler_.current_unit(mouse_handler_) !=
units_.end();
case hotkey::HOTKEY_RENAME_UNIT:
- return !events::commands_disabled && !browse_ &&
+ return !events::commands_disabled &&
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