[Wesnoth-cvs-commits] wesnoth/src mapgen.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/04/09 21:32:03

Modified files:
        src            : mapgen.cpp 

Log message:
        Fix bug #8848. The min_distance value is no more a strong 
recommendation, it is a strict requirement.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/mapgen.cpp.diff?tr1=1.62&tr2=1.63&r1=text&r2=text

Patches:
Index: wesnoth/src/mapgen.cpp
diff -u wesnoth/src/mapgen.cpp:1.62 wesnoth/src/mapgen.cpp:1.63
--- wesnoth/src/mapgen.cpp:1.62 Sat Apr  9 20:24:05 2005
+++ wesnoth/src/mapgen.cpp      Sat Apr  9 21:32:03 2005
@@ -406,7 +406,7 @@
 
                if(distance < min_distance) {
                        avg_distance = 0;
-                       break;
+                       return -1;
                }
 
                avg_distance += distance;
@@ -832,7 +832,7 @@
                const size_t min_distance = 
atoi((*castle_config)["min_distance"].c_str());
 
                location best_loc;
-               int best_ranking = -1;
+               int best_ranking = 0;
                for(int x = min_x; x != max_x; ++x) {
                        for(int y = min_y; y != max_y; ++y) {
                                const location loc(x,y);