diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 22:44:02 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-03 22:44:02 +0000 |
commit | 586523e7dbdc643f952ae90c67af0cfbfc97f460 (patch) | |
tree | 7562485e72e060f2f69c382bb77d5ac76d94b84a /crawl-ref/source/macro.cc | |
parent | f681507d16fe97426545dffe4c2827bb878f5f7f (diff) | |
download | crawl-ref-586523e7dbdc643f952ae90c67af0cfbfc97f460.tar.gz crawl-ref-586523e7dbdc643f952ae90c67af0cfbfc97f460.zip |
Fix 2026005: macros being loaded in the wrong order.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7110 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/macro.cc')
-rw-r--r-- | crawl-ref/source/macro.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 4c812db129..d7d284b5f0 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -895,10 +895,8 @@ static void _read_macros_from(const char* filename) } } -int macro_init( void ) +void macro_init() { - _read_macros_from(get_macro_file().c_str()); - const std::vector<std::string>& files = Options.additional_macro_files; for (std::vector<std::string>::const_iterator it = files.begin(); it != files.end(); @@ -907,8 +905,7 @@ int macro_init( void ) _read_macros_from(it->c_str()); } - - return 0; + _read_macros_from(get_macro_file().c_str()); } |