summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/macro.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/macro.cc')
-rw-r--r--crawl-ref/source/macro.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc
index ed03525f9f..9a80fe032a 100644
--- a/crawl-ref/source/macro.cc
+++ b/crawl-ref/source/macro.cc
@@ -170,11 +170,10 @@ static int userfunc_getindex(const std::string &fname)
*/
static std::string get_macro_file()
{
- std::string s;
-
- if (SysEnv.crawl_dir)
- s = SysEnv.crawl_dir;
+ if (SysEnv.macro_file.length())
+ return (SysEnv.macro_file);
+ std::string s = SysEnv.crawl_dir? SysEnv.crawl_dir : "";
return (s + "macro.txt");
}