summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 08:41:20 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-11-22 08:41:20 +0000
commit1d0f57cbceb778139ca215cc4fcfd1584951f6dd (patch)
treecafd60c944c51fcce778aa5d6912bc548c518339 /crawl-ref/source/initfile.h
parent6f5e187a9e5cd348296dba2fd89d2e206e775a01 (diff)
downloadcrawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.tar.gz
crawl-ref-1d0f57cbceb778139ca215cc4fcfd1584951f6dd.zip
Merged stone_soup r15:451 into trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.h')
-rw-r--r--crawl-ref/source/initfile.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h
index d5860fdd77..ffe3ff5c30 100644
--- a/crawl-ref/source/initfile.h
+++ b/crawl-ref/source/initfile.h
@@ -3,6 +3,8 @@
* Summary: Simple reading of init file.
* Written by: David Loewenstern
*
+ * Modified for Crawl Reference by $Author$ on $Date$
+ *
* Change History (most recent first):
*
* <1> 6/9/99 DML Created
@@ -16,12 +18,14 @@
#include <cstdio>
std::string & trim_string( std::string &str );
+std::string & tolower_string( std::string &str );
+int str_to_colour( const std::string &str, int default_colour = -1 );
// last updated 12may2000 {dlb}
/* ***********************************************************************
* called from: acr
* *********************************************************************** */
-void read_init_file(bool runscript = false);
+std::string read_init_file(bool runscript = false);
void read_options(FILE *f, bool runscript = false);
@@ -29,6 +33,8 @@ void read_options(const std::string &s, bool runscript = false);
void parse_option_line(const std::string &line, bool runscript = false);
+void apply_ascii_display(bool ascii);
+
// last updated 12may2000 {dlb}
/* ***********************************************************************
* called from: acr