diff options
| author | Neil Moore <neil@s-z.org> | 2014-08-02 01:11:56 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-08-02 01:11:56 -0400 |
| commit | d4b779af619a8643968600a41d38d85fc82bd2b7 (patch) | |
| tree | bd98b52549e29ffe4364816e8e1e5126e8f37704 /crawl-ref/source/options.h | |
| parent | e65269780554b34db055ccaf3d7f1874c5241415 (diff) | |
| download | crawl-ref-d4b779af619a8643968600a41d38d85fc82bd2b7.tar.gz crawl-ref-d4b779af619a8643968600a41d38d85fc82bd2b7.zip | |
Let macro_colour handle -1 (by passing it through)
Diffstat (limited to 'crawl-ref/source/options.h')
| -rw-r--r-- | crawl-ref/source/options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index 6f79d19766..ecd96551c4 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -539,8 +539,8 @@ extern game_options Options; static inline short macro_colour(short col) { - ASSERT_RANGE(col, 0, MAX_TERM_COLOUR); - return Options.colour[ col ]; + ASSERT(col < MAX_TERM_COLOUR); + return col < 0 ? col : Options.colour[ col ]; } #endif |