diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 00:51:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-08 00:51:16 +0000 |
| commit | e94375e1a0ecdbfa3032609c29a42eb071d3682a (patch) | |
| tree | 5661093954d268b21c9c05863536f1ee272bd2f7 /crawl-ref/source/macro.cc | |
| parent | 6a9d2c4e4557186178402684f6c443b18d4f1a82 (diff) | |
| download | crawl-ref-e94375e1a0ecdbfa3032609c29a42eb071d3682a.tar.gz crawl-ref-e94375e1a0ecdbfa3032609c29a42eb071d3682a.zip | |
Apply tutorial fixes as well as the macro/wininit path to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6448 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/macro.cc')
| -rw-r--r-- | crawl-ref/source/macro.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 5f2542bf39..712cd8c39d 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -158,7 +158,7 @@ static int userfunc_getindex(const std::string &fname) return (i); } - // Pass 2 to hunt for gaps + // Pass 2 to hunt for gaps. for (int i = 0, count = userfunctions.size(); i < count; ++i) { if (userfunctions[i].empty()) @@ -172,14 +172,11 @@ static int userfunc_getindex(const std::string &fname) return (userfunctions.size() - 1); } -/* - * Returns the name of the file that contains macros. - */ +// Returns the name of the file that contains macros. static std::string get_macro_file() { - std::string dir = - !Options.macro_dir.empty()? Options.macro_dir : - !SysEnv.crawl_dir.empty()? SysEnv.crawl_dir : ""; + std::string dir = !Options.macro_dir.empty() ? Options.macro_dir : + !SysEnv.crawl_dir.empty() ? SysEnv.crawl_dir : ""; if (!dir.empty()) { |