diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-28 17:27:46 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-28 18:18:16 +0100 |
| commit | b1ad22ee0d4a186aa9b6096448cd32f9bfa4e1bd (patch) | |
| tree | 400371d0d7d3dac8ae5189aa03c79c7bf80c1e9e /crawl-ref/source/defines.h | |
| parent | 6e1cc1abcff78fb383e25641b0b424bfb1d2ebb4 (diff) | |
| download | crawl-ref-b1ad22ee0d4a186aa9b6096448cd32f9bfa4e1bd.tar.gz crawl-ref-b1ad22ee0d4a186aa9b6096448cd32f9bfa4e1bd.zip | |
Remove aged commented #ifdef COLOUR_OPTS from defines.h.
Diffstat (limited to 'crawl-ref/source/defines.h')
| -rw-r--r-- | crawl-ref/source/defines.h | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h index a038a9d321..730c6af738 100644 --- a/crawl-ref/source/defines.h +++ b/crawl-ref/source/defines.h @@ -227,35 +227,31 @@ enum COLORS // try to get a brighter version using recommisioned attribute flags. #define COLFLAG_CURSES_BRIGHTEN 0x0080 -//#ifdef USE_COLOUR_OPTS - - #define COLFLAG_FRIENDLY_MONSTER 0x0100 - #define COLFLAG_NEUTRAL_MONSTER 0x0200 - #define COLFLAG_WILLSTAB 0x0400 - #define COLFLAG_MAYSTAB 0x0800 - #define COLFLAG_ITEM_HEAP 0x1000 - #define COLFLAG_FEATURE_ITEM 0x2000 - #define COLFLAG_TRAP_ITEM 0x4000 - #define COLFLAG_REVERSE 0x8000 - #define COLFLAG_MASK 0xFF00 - - enum CHAR_ATTRIBUTES - { - CHATTR_NORMAL, /* 0 */ - CHATTR_STANDOUT, - CHATTR_BOLD, - CHATTR_BLINK, - CHATTR_UNDERLINE, - CHATTR_REVERSE, /* 5 */ - CHATTR_DIM, - CHATTR_HILITE, - - CHATTR_ATTRMASK = 0xF, /* 15 (well, obviously) */ - - CHATTR_COLMASK = 0xF00 // Mask with this to get extra colour info. - }; - -//#endif +#define COLFLAG_FRIENDLY_MONSTER 0x0100 +#define COLFLAG_NEUTRAL_MONSTER 0x0200 +#define COLFLAG_WILLSTAB 0x0400 +#define COLFLAG_MAYSTAB 0x0800 +#define COLFLAG_ITEM_HEAP 0x1000 +#define COLFLAG_FEATURE_ITEM 0x2000 +#define COLFLAG_TRAP_ITEM 0x4000 +#define COLFLAG_REVERSE 0x8000 +#define COLFLAG_MASK 0xFF00 + +enum CHAR_ATTRIBUTES +{ + CHATTR_NORMAL, /* 0 */ + CHATTR_STANDOUT, + CHATTR_BOLD, + CHATTR_BLINK, + CHATTR_UNDERLINE, + CHATTR_REVERSE, /* 5 */ + CHATTR_DIM, + CHATTR_HILITE, + + CHATTR_ATTRMASK = 0xF, /* 15 (well, obviously) */ + + CHATTR_COLMASK = 0xF00 // Mask with this to get extra colour info. +}; #define PDESCS(colour) (colour) #define PDESCQ(qualifier, colour) (((qualifier) * PDC_NCOLOURS) + (colour)) |