diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 01:10:58 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-12 01:10:58 +0000 |
| commit | 8bcb968c73563276b4a225fc94baf3cb32f394c2 (patch) | |
| tree | c2fcc40dc6aa0399a4e6d33b211a4ac75378a415 /crawl-ref/source/libw32c.cc | |
| parent | 1e77f1d5c4621923e9943cf901e95058b18969e2 (diff) | |
| download | crawl-ref-8bcb968c73563276b4a225fc94baf3cb32f394c2.tar.gz crawl-ref-8bcb968c73563276b4a225fc94baf3cb32f394c2.zip | |
Applying r6506, r6507 to 0.4.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6508 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libw32c.cc')
| -rw-r--r-- | crawl-ref/source/libw32c.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc index b2f9d1e885..2b4afc99cc 100644 --- a/crawl-ref/source/libw32c.cc +++ b/crawl-ref/source/libw32c.cc @@ -1,4 +1,5 @@ #include "AppHdr.h" +#include "externs.h" #if defined(WIN32CONSOLE) @@ -539,7 +540,12 @@ void textattr(int c) void textcolor(int c) { // change current color used to stamp chars - current_color = c; + short fg = c & 0xF; + short bg = (c >> 4) & 0xF; + short macro_fg = Options.colour[fg]; + short macro_bg = Options.colour[bg]; + + current_color = macro_fg | (macro_bg << 4); } void clear_message_window() |