summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/defines.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-06 20:14:35 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-06 20:14:35 +0000
commit44d7fbb36c55859117824fe25a298afbe437221b (patch)
tree8854c7d492879cb8ddda79ca91f44d964c5828a9 /crawl-ref/source/defines.h
parentb847d4bad842066f8721cf68650d5087528e8486 (diff)
downloadcrawl-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/defines.h')
-rw-r--r--crawl-ref/source/defines.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 267e81ffce..4ee5296b04 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -8,7 +8,7 @@
* because there are in numerical order. But I'm too lazy to
* do it myself.
*
- * Copyright © 1999 Brian Robinson. // Me? How come?
+ * Copyright � 1999 Brian Robinson. // Me? How come?
*
* Modified for Crawl Reference by $Author$ on $Date$
*
@@ -262,7 +262,7 @@ const int LABYRINTH_BORDER = 4;
#define COLFLAG_WILLSTAB 0x0400
#define COLFLAG_MAYSTAB 0x0800
#define COLFLAG_ITEM_HEAP 0x1000
- #define COLFLAG_STAIR_ITEM 0x2000
+ #define COLFLAG_FEATURE_ITEM 0x2000
#define COLFLAG_TRAP_ITEM 0x4000
#define COLFLAG_REVERSE 0x8000
#define COLFLAG_MASK 0xFF00