mail[Wesnoth-commits] r14067 - /branches/mordante_terrain/src/builder.cpp


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

Header


Content

Posted by koraq on October 25, 2006 - 18:44:
Author: mordante
Date: Wed Oct 25 18:43:51 2006
New Revision: 14067

URL: http://svn.gna.org/viewcvs/wesnoth?rev=14067&view=rev
Log:
Two fixes for the terrain transition. It seems to work good again, but more 
testing is still required.

Modified:
    branches/mordante_terrain/src/builder.cpp

Modified: branches/mordante_terrain/src/builder.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/mordante_terrain/src/builder.cpp?rev=14067&r1=14066&r2=14067&view=diff
==============================================================================
--- branches/mordante_terrain/src/builder.cpp (original)
+++ branches/mordante_terrain/src/builder.cpp Wed Oct 25 18:43:51 2006
@@ -1000,7 +1000,7 @@
                return INT_MAX;
        if(types.front() == terrain_translation::NOT)
                return INT_MAX;
-       if(std::find(types.begin(), types.end(), terrain_translation::STAR) 
== types.end())
+       if(std::find(types.begin(), types.end(), terrain_translation::STAR) 
!= types.end())
                return INT_MAX;
 
        gamemap::location adj[6];
@@ -1133,12 +1133,7 @@
                                if(cons != rule->second.constraints.end()) {
                                        adjacent_types[i] = 
cons->second.terrain_types;
                                } else {
-                                       //FIXME MdW the previous code set the 
value to an empty
-                                       //string, not sure whether this part 
is a valid code part
-                                       //so assert for now
-//                                     wassert(false);
-                                       adjacent_types[i] = 
std::vector<terrain_translation::TERRAIN_NUMBER>();
-                                       adjacent_types[i].push_back(0); // 
required?
+                                       adjacent_types[i] = 
terrain_translation().get_list("");
                                }
                        }
 




Related Messages


Powered by MHonArc, Updated Wed Oct 25 19:01:22 2006