diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-01 11:42:47 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-06-01 11:42:47 +0000 |
| commit | 80e2e061e3f9c9791daf4e00361bf47092087f07 (patch) | |
| tree | 636d4f0d3391b66418f9183cefb54eb5c8dbc8bb /crawl-ref/source/libunix.cc | |
| parent | 8e2be8ec8458f1e16873a6d12522e2b75683ba1d (diff) | |
| download | crawl-ref-80e2e061e3f9c9791daf4e00361bf47092087f07.tar.gz crawl-ref-80e2e061e3f9c9791daf4e00361bf47092087f07.zip | |
[1603676] Stairs override items on the same square for display purposes if
stair_item_brand is set (defaults to reverse).
Fixed compile error in clua.cc (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1499 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libunix.cc')
| -rw-r--r-- | crawl-ref/source/libunix.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 65eac622ef..79f91d17b7 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -500,12 +500,13 @@ bool is_cursor_enabled() inline unsigned get_brand(int col) { - return (col & COLFLAG_FRIENDLY_MONSTER)? Options.friend_brand : - (col & COLFLAG_ITEM_HEAP)? Options.heap_brand : - (col & COLFLAG_WILLSTAB)? Options.stab_brand : - (col & COLFLAG_MAYSTAB)? Options.may_stab_brand : - (col & COLFLAG_REVERSE)? CHATTR_REVERSE : - CHATTR_NORMAL; + return (col & COLFLAG_FRIENDLY_MONSTER)? Options.friend_brand : + (col & COLFLAG_ITEM_HEAP)? Options.heap_brand : + (col & COLFLAG_WILLSTAB)? Options.stab_brand : + (col & COLFLAG_MAYSTAB)? Options.may_stab_brand : + (col & COLFLAG_STAIR_ITEM)? Options.stair_item_brand : + (col & COLFLAG_REVERSE)? CHATTR_REVERSE : + CHATTR_NORMAL; } void textattr(int col) |