Author: brunowolff
Date: Wed Mar 19 16:57:14 2008
New Revision: 24829
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24829&view=rev
Log:
Silence gcc warning by adding parens around && clause near ||.
Modified:
trunk/src/marked-up_text.cpp
Modified: trunk/src/marked-up_text.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/marked-up_text.cpp?rev=24829&r1=24828&r2=24829&view=diff
==============================================================================
--- trunk/src/marked-up_text.cpp (original)
+++ trunk/src/marked-up_text.cpp Wed Mar 19 16:57:14 2008
@@ -443,7 +443,7 @@
}
}
- if(line_break || current_word.empty() && ch == end) {
+ if(line_break || (current_word.empty() && ch == end)) {
SDL_Rect size = line_size(current_line, font_sz, style);
if(max_height > 0 && current_height + size.h >=
size_t(max_height)) {
return wrapped_text;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits