Author: brunowolff
Date: Wed Mar 19 18:19:34 2008
New Revision: 24856
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24856&view=rev
Log:
Silence gcc 4.3 warning by adding parens around && clause near ||.
Modified:
trunk/src/menu_events.cpp
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=24856&r1=24855&r2=24856&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Wed Mar 19 18:19:34 2008
@@ -511,8 +511,8 @@
void action(gui::dialog_process_info &info) {
const bool leader_bool = leader_bools_[get_menu().selection()];
scroll_btn_->enable(leader_bool);
- if(leader_bool && (info.double_clicked || !info.key_down
- && (info.key[SDLK_RETURN] || info.key[SDLK_KP_ENTER]))) {
+ if(leader_bool && (info.double_clicked || (!info.key_down
+ && (info.key[SDLK_RETURN] || info.key[SDLK_KP_ENTER])))) {
set_result(get_menu().selection());
} else if(!info.key_down && info.key[SDLK_ESCAPE]) {
set_result(gui::CLOSE_DIALOG);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
