Author: alink
Date: Sun Jul 27 02:56:14 2008
New Revision: 28234
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28234&view=rev
Log:
Better quick fix than the previous commit (fixing "../scenery/something.png" in
terrain-wml). Now support any "terrain/../directory" and so "/items" too.
Thanks Shadow_Master for the idea.
Modified:
trunk/src/builder.cpp
Modified: trunk/src/builder.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/builder.cpp?rev=28234&r1=28233&r2=28234&view=diff
==============================================================================
--- trunk/src/builder.cpp (original)
+++ trunk/src/builder.cpp Sun Jul 27 02:56:14 2008
@@ -162,8 +162,7 @@
//image::flush_cache();
image::precache_file_existence("terrain/");
- // some terrain rules also use scenery images
- image::precache_file_existence("scenery/");
+
parse_config(cfg);
parse_config(level);
add_off_map_rule(offmap_image);
@@ -287,7 +286,8 @@
s = s.substr(0, s.find_first_of(",:"));
// we already precached file existence in the
constructor
- if(!image::exists("terrain/" + s + ".png",
true))
+ // but only for filenames not using ".."
+ if(!image::exists("terrain/" + s + ".png",
s.find("..") == std::string::npos))
return false;
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
