diff options
| author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-20 15:51:35 +0100 |
|---|---|---|
| committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-20 16:13:10 +0100 |
| commit | 57ce023677fd391ca2bfdb996cdee9455dfed073 (patch) | |
| tree | 1416ca38eab10ac08f19689c9d30ec9ca22f61f0 /crawl-ref/source/libunix.cc | |
| parent | f6757c334319976ad2964b2be1f6a07066d9e60f (diff) | |
| download | crawl-ref-57ce023677fd391ca2bfdb996cdee9455dfed073.tar.gz crawl-ref-57ce023677fd391ca2bfdb996cdee9455dfed073.zip | |
Rename unix background option to background_colour.
The keyword "background" is now used for the character background,
previously "job".
Diffstat (limited to 'crawl-ref/source/libunix.cc')
| -rw-r--r-- | crawl-ref/source/libunix.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 0f13eb10b9..ceb0c4e852 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -149,16 +149,14 @@ static void setup_colour_pairs( void ) short i, j; for (i = 0; i < 8; i++) - { for (j = 0; j < 8; j++) { if (( i > 0 ) || ( j > 0 )) init_pair(i * 8 + j, j, i); } - } - init_pair(63, COLOR_BLACK, Options.background); -} // end setup_colour_pairs() + init_pair(63, COLOR_BLACK, Options.background_colour); +} #ifdef UNICODE_GLYPHS static std::string unix_glyph2string(unsigned gly) @@ -819,7 +817,8 @@ static int curs_fg_attr(int col) FG_COL = col & 0x00ff; fg = translate_colour( macro_colour( FG_COL ) ); - bg = translate_colour( (BG_COL == BLACK) ? Options.background : BG_COL ); + bg = translate_colour( BG_COL == BLACK ? Options.background_colour + : BG_COL ); // calculate which curses flags we need... unsigned int flags = 0; @@ -881,7 +880,8 @@ static int curs_bg_attr(int col) BG_COL = col & 0x00ff; fg = translate_colour( macro_colour( FG_COL ) ); - bg = translate_colour( (BG_COL == BLACK) ? Options.background : BG_COL ); + bg = translate_colour( BG_COL == BLACK ? Options.background_colour + : BG_COL ); unsigned int flags = 0; |