mail[Wesnoth-commits] r44007 - /trunk/src/builder.cpp


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

Header


Content

Posted by alinktomine on July 08, 2010 - 21:59:
Author: alink
Date: Thu Jul  8 21:59:59 2010
New Revision: 44007

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44007&view=rev
Log:
Fix _off^_usr not using the tile_image of theme.

Modified:
    trunk/src/builder.cpp

Modified: trunk/src/builder.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/builder.cpp?rev=44007&r1=44006&r2=44007&view=diff
==============================================================================
--- trunk/src/builder.cpp (original)
+++ trunk/src/builder.cpp Thu Jul  8 21:59:59 2010
@@ -168,6 +168,8 @@
        image::precache_file_existence("terrain/");
 
        if(building_rules_.empty() && rules_cfg_){
+               //off_map first to prevent some default rule seems to block it
+               add_off_map_rule(offmap_image);
                // parse global terrain rules
                parse_global_config(*rules_cfg_);
        } else {
@@ -177,7 +179,6 @@
 
        // parse local rules
        parse_config(level);
-       add_off_map_rule(offmap_image);
 
        build_terrains();
 }
@@ -895,7 +896,7 @@
        item["set_flag"] = "base";
 
        // Parse the object
-       parse_config(cfg);
+       parse_global_config(cfg);
 }
 
 bool terrain_builder::rule_matches(const terrain_builder::building_rule 
&rule,




Related Messages


Powered by MHonArc, Updated Thu Jul 08 22:40:09 2010