upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 18:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

%final.cfg is working.

Browse Source
This commit is contained in:
Eric S. Raymond 2007-05-14 13:25:00 +00:00
parent 21f91b02f3
commit cd73d3d331
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/game.cfg
View File

@ -2,12 +2,12 @@
{utils/}
{misc/} # Note: misc/tips.cfg is wired into the C++.
# These locations are wired into the C++
{fonts.cfg}
{english.cfg}
{terrain.cfg}
{terrain-graphics.cfg}
{units.cfg}
{terrain-graphics/}
{units.cfg}
{campaigns/}
[advanced_preference]

3
data/terrain-graphics.cfg → data/terrain-graphics/%final.cfg
View File

@ -12,8 +12,7 @@
# the proper way to calculate the propabilities is described here
# http://www.wesnoth.org/wiki/Terrain_Graphics_Probability
# The following should be kept on top of the file
{terrain-graphics}
# This file needs to be evaluated after everything else in this directory.
#-----------------------------------------------------------------
# forest/pine<->Castle|Encampment special cases, also used by some other

2
src/filesystem.cpp
View File

@ -180,7 +180,7 @@ void get_files_in_dir(const std::string& directory,
if(!directory.empty() && directory[0] != '/' && !game_config::path.empty()){
const std::string& dir = game_config::path + "/" + directory;
if(is_directory(dir)) {
get_files_in_dir(dir,files,dirs,mode);
get_files_in_dir(dir,files,dirs,mode,reorder);
return;
}
}

2
src/serialization/preprocessor.cpp
View File

@ -198,7 +198,7 @@ preprocessor_file::preprocessor_file(preprocessor_streambuf &t, std::string cons
: preprocessor(t)
{
if (is_directory(name))
get_files_in_dir(name, &files_, NULL, ENTIRE_FILE_PATH);
get_files_in_dir(name, &files_, NULL, ENTIRE_FILE_PATH, DO_REORDER);
else
new preprocessor_data(t, istream_file(name), "", name, 1, directory_name(name), t.textdomain_);
pos_ = files_.begin();