diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-21 19:15:05 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-21 19:15:05 +0000 |
| commit | 08ce2f4312a8a4eb6f81d99a595992eb694df7df (patch) | |
| tree | 47f198a2eb892c5ccedfea7073f3498277193bef | |
| parent | d741c66e9789663927c2adb0cd9e361b93e80e0e (diff) | |
| download | crawl-ref-08ce2f4312a8a4eb6f81d99a595992eb694df7df.tar.gz crawl-ref-08ce2f4312a8a4eb6f81d99a595992eb694df7df.zip | |
Trunk->0.3 merge: accept "none" to disable brands.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2512 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 602269e42d..6eb8de2cda 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -371,7 +371,7 @@ static unsigned curses_attribute(const std::string &field) else return CHATTR_HILITE | (colour << 8); } - else + else if (field != "none") fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); return CHATTR_NORMAL; } |