diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-06 20:14:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-06 20:14:35 +0000 |
| commit | 44d7fbb36c55859117824fe25a298afbe437221b (patch) | |
| tree | 8854c7d492879cb8ddda79ca91f44d964c5828a9 /crawl-ref/source/libunix.cc | |
| parent | b847d4bad842066f8721cf68650d5087528e8486 (diff) | |
| download | crawl-ref-44d7fbb36c55859117824fe25a298afbe437221b.tar.gz crawl-ref-44d7fbb36c55859117824fe25a298afbe437221b.zip | |
Fix 1870427: Max hp misreported if frail and rotted.
Fix 2002931: feature_item_brand not working
No, it's not the important bugs, but at least these are bugs I can
reproduce. :P
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6433 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/libunix.cc')
| -rw-r--r-- | crawl-ref/source/libunix.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index eb66fb36ab..0859bc18f6 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -744,15 +744,15 @@ bool is_cursor_enabled() inline unsigned get_brand(int col) { - return (col & COLFLAG_FRIENDLY_MONSTER)? Options.friend_brand : - (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; + return (col & COLFLAG_FRIENDLY_MONSTER) ? Options.friend_brand : + (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_FEATURE_ITEM) ? Options.feature_item_brand : + (col & COLFLAG_TRAP_ITEM) ? Options.trap_item_brand : + (col & COLFLAG_REVERSE) ? CHATTR_REVERSE + : CHATTR_NORMAL; } void textattr(int col) |