diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
| commit | 8b6403164380ecbc2a0a16b15757fd2cdce548eb (patch) | |
| tree | 2f6d8bf84b4be0b82aad5ef055516e758e505b16 /crawl-ref/source/initfile.cc | |
| parent | cd9d13b92dee71ff7671c10e69e4508b7554ff69 (diff) | |
| download | crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.tar.gz crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.zip | |
Merge trunk back into 0.2 for 0.2.2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -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 5eff2da5c6..b948c557e8 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1296,7 +1296,7 @@ void game_options::add_message_colour_mapping(const std::string &field) if (cmap.size() != 2) return; - const int col = str_to_colour( cmap[0] ); + const int col = (cmap[0]=="mute") ? MSGCOL_MUTED : str_to_colour(cmap[0]); if (col == -1) return; |