diff options
author | Charles Otto <ottochar@gmail.com> | 2010-02-03 19:39:42 -0500 |
---|---|---|
committer | Charles Otto <ottochar@gmail.com> | 2010-02-03 19:39:42 -0500 |
commit | 7ab7353ee4623f5444a951b759ba3625e075fcfd (patch) | |
tree | 7d7d1877c65fc2a585be49755e98cdd671fe7073 /crawl-ref/source/fprop.h | |
parent | a9184742d2a9c6b4b5ee62da8f2b73aa5faa44ab (diff) | |
parent | fbe3fadd0e70c6932475afe4527db7f65ca23a30 (diff) | |
download | crawl-ref-7ab7353ee4623f5444a951b759ba3625e075fcfd.tar.gz crawl-ref-7ab7353ee4623f5444a951b759ba3625e075fcfd.zip |
Merging master
Diffstat (limited to 'crawl-ref/source/fprop.h')
-rw-r--r-- | crawl-ref/source/fprop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fprop.h b/crawl-ref/source/fprop.h index 9995ce9ca1..a8227ce79c 100644 --- a/crawl-ref/source/fprop.h +++ b/crawl-ref/source/fprop.h @@ -20,8 +20,8 @@ enum feature_property_type // Squares that the tide should not affect. FPROP_NO_TIDE = (1 << 10), - - FPROP_MOLD = (1 << 11) + FPROP_NO_SUBMERGE = (1 << 11), + FPROP_MOLD = (1 << 12) }; |