mail[Wesnoth-commits] r24828 - /trunk/src/mapgen.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by bruno on March 19, 2008 - 17:06:
Author: brunowolff
Date: Wed Mar 19 16:55:07 2008
New Revision: 24828

URL: http://svn.gna.org/viewcvs/wesnoth?rev=24828&view=rev
Log:
Silence gcc 4.3 warnings by adding parens around && cluases near ||.

Modified:
    trunk/src/mapgen.cpp

Modified: trunk/src/mapgen.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mapgen.cpp?rev=24828&r1=24827&r2=24828&view=diff
==============================================================================
--- trunk/src/mapgen.cpp (original)
+++ trunk/src/mapgen.cpp Wed Mar 19 16:55:07 2008
@@ -1070,17 +1070,17 @@
                                        int direction = -1;
 
                                        // If we are going north-south
-                                       if(last == adj[0] && next == adj[3] 
|| last == adj[3] && next == adj[0]) {
+                                       if((last == adj[0] && next == adj[3]) 
|| (last == adj[3] && next == adj[0])) {
                                                direction = 0;
                                        }
 
                                        // If we are going south west-north 
east
-                                       else if(last == adj[1] && next == 
adj[4] || last == adj[4] && next == adj[1]) {
+                                       else if((last == adj[1] && next == 
adj[4]) || (last == adj[4] && next == adj[1])) {
                                                direction = 1;
                                        }
 
                                        // If we are going south east-north 
west
-                                       else if(last == adj[2] && next == 
adj[5] || last == adj[5] && next == adj[2]) {
+                                       else if((last == adj[2] && next == 
adj[5]) || (last == adj[5] && next == adj[2])) {
                                                direction = 2;
                                        }
 




Related Messages


Powered by MHonArc, Updated Wed Mar 19 17:41:16 2008