Back out the changes that require %final.cfg to work...
...until we get a Windows port patch. Restore tips.cfg to original position.
This commit is contained in:
parent
b0de30d54c
commit
2b10a4b87d
4 changed files with 4 additions and 3 deletions
|
@ -1,12 +1,13 @@
|
|||
{themes/}
|
||||
{utils/}
|
||||
{misc/} # Note: misc/tips.cfg is wired into the C++.
|
||||
{misc/}
|
||||
|
||||
# These locations are wired into the C++
|
||||
{tips.cfg}
|
||||
{fonts.cfg}
|
||||
{english.cfg}
|
||||
|
||||
{terrain-graphics/}
|
||||
{terrain-graphics.cfg}
|
||||
{units.cfg}
|
||||
{campaigns/}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ static const config get_tips_of_day()
|
|||
|
||||
std::cerr << "Loading tips of day\n";
|
||||
try {
|
||||
scoped_istream stream = preprocess_file("data/misc/tips.cfg");
|
||||
scoped_istream stream = preprocess_file("data/tips.cfg");
|
||||
read(cfg, *stream);
|
||||
} catch(config::error&) {
|
||||
std::cerr << "Could not read tips.cfg\n";
|
||||
|
|
Loading…
Add table
Reference in a new issue