diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-21 01:03:15 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-21 01:03:15 +0000 |
| commit | 700ca72344804d0a20d7913c537e57c375bbb36d (patch) | |
| tree | 16de34571688c761cfaf7809cac917c9dbe8578b /crawl-ref/source/libunix.cc | |
| parent | a84ea40a942fa25720d2484dabd8ed33cdf5582e (diff) | |
| download | crawl-ref-700ca72344804d0a20d7913c537e57c375bbb36d.tar.gz crawl-ref-700ca72344804d0a20d7913c537e57c375bbb36d.zip | |
Add a neutral monster brand (defaulting to darkgrey).
Of course we still need something like this for Tiles!
Make Ctrl+Dir call close_door() if the square in question is a closed door.
I've tested it, and found this change (suggested by dpeg) extremely convenient.
Also fixed the information leak about an invisible monster blocking a doorway
without time passing.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3778 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 d90347dbf9..60e24b6128 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -744,12 +744,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_STAIR_ITEM)? Options.feature_item_brand : - (col & COLFLAG_TRAP_ITEM)? Options.trap_item_brand : - (col & COLFLAG_REVERSE)? CHATTR_REVERSE : + (col & COLFLAG_NEUTRAL_MONSTER)? Options.neutral_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.feature_item_brand : + (col & COLFLAG_TRAP_ITEM)? Options.trap_item_brand : + (col & COLFLAG_REVERSE)? CHATTR_REVERSE : CHATTR_NORMAL; } |