mail[Wesnoth-commits] r14022 - /branches/1.2/src/unit_types.cpp


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

Header


Content

Posted by koraq on October 19, 2006 - 21:23:
Author: mordante
Date: Thu Oct 19 21:23:21 2006
New Revision: 14022

URL: http://svn.gna.org/viewcvs/wesnoth?rev=14022&view=rev
Log:
Commit r13937 should also have been applied to unit_types.cpp since it has 
the same terrain alias bug.

Modified:
    branches/1.2/src/unit_types.cpp

Modified: branches/1.2/src/unit_types.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/branches/1.2/src/unit_types.cpp?rev=14022&r1=14021&r2=14022&view=diff
==============================================================================
--- branches/1.2/src/unit_types.cpp (original)
+++ branches/1.2/src/unit_types.cpp Thu Oct 19 21:23:21 2006
@@ -474,7 +474,7 @@
        }
 
        //if this is an alias, then select the best of all underlying terrains
-       const std::string& underlying = map.underlying_mvt_terrain(terrain);
+       const std::string& underlying = map.underlying_def_terrain(terrain);
        if(underlying.size() != 1 || underlying[0] != terrain) {
                bool revert = (underlying[0] == '-'?true:false);
                if(recurse_count >= 100) {
@@ -496,9 +496,6 @@
                        } else if(value > ret_value && revert) {
                                ret_value = value;
                        }
-                       if(value < ret_value) {
-                               ret_value = value;
-                       }
                }
 
                
defenseMods_.insert(std::pair<gamemap::TERRAIN,int>(terrain,ret_value));




Related Messages


Powered by MHonArc, Updated Thu Oct 19 21:40:39 2006