summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorreaver <address.auto@gmail.com>2014-04-12 23:41:56 -0400
committerSteve Melenchuk <smelenchuk@gmail.com>2014-04-14 22:25:16 -0600
commit6d8a42cd9ae10e2f4931a80236c1b3e001368953 (patch)
treee9af4cd9aac560a89258a907e08a0ec048532303 /crawl-ref/source/initfile.cc
parent961a08fe896de355d603cf447009c4dac0f8a2ec (diff)
downloadcrawl-ref-6d8a42cd9ae10e2f4931a80236c1b3e001368953.tar.gz
crawl-ref-6d8a42cd9ae10e2f4931a80236c1b3e001368953.zip
Move some main.cc functions to a new file
Specifically player_reacts, decrement_durations, and various helper functions. [Committer's note: updated the xcode and MSVC project files too; I don't guarantee that they work.] Signed-off-by: Steve Melenchuk <smelenchuk@gmail.com>
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 7db2a01b2a..92b60f6cc6 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -2493,9 +2493,7 @@ void game_options::read_option_line(const string &str, bool runscript)
#endif
}
else if (key == "terp_file" && runscript)
- {
terp_files.push_back(field);
- }
else if (key == "colour" || key == "color")
{
const int orig_col = str_to_colour(subkey);