Author: shadowmaster
Date: Sun Mar 22 02:39:12 2009
New Revision: 34013
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34013&view=rev
Log:
Fix a G++ 4.3 warning reported by Zen_Clark on IRC:
src/editor2/editor_controller.cpp:704: warning: suggest parentheses around &&
within ||
Ilor, please check that I didn't screw up the logic of this code
(apparently not).
Modified:
trunk/src/editor2/editor_controller.cpp
Modified: trunk/src/editor2/editor_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.cpp?rev=34013&r1=34012&r2=34013&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.cpp (original)
+++ trunk/src/editor2/editor_controller.cpp Sun Mar 22 02:39:12 2009
@@ -699,9 +699,9 @@
return;
} else {
if (get_map_context().needs_terrain_rebuild()) {
- if ((auto_update_transitions_ ==
TransitionUpdateMode::on)
- || (auto_update_transitions_ ==
TransitionUpdateMode::partial)
- && (!drag_part ||
get_map_context().everything_changed())) {
+ if ((auto_update_transitions_ ==
TransitionUpdateMode::on)
+ || ((auto_update_transitions_ ==
TransitionUpdateMode::partial)
+ && (!drag_part ||
get_map_context().everything_changed()))) {
gui().rebuild_all();
get_map_context().set_needs_terrain_rebuild(false);
gui().invalidate_all();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
