diff options
Diffstat (limited to 'crawl-ref/source/fprop.h')
| -rw-r--r-- | crawl-ref/source/fprop.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/crawl-ref/source/fprop.h b/crawl-ref/source/fprop.h index 54be5a597e..88e5fab10b 100644 --- a/crawl-ref/source/fprop.h +++ b/crawl-ref/source/fprop.h @@ -3,10 +3,6 @@ struct coord_def; -bool is_sanctuary( const coord_def& p ); -bool is_bloodcovered( const coord_def& p ); -int str_to_fprop (const std::string &str); - enum feature_property_type { FPROP_NONE = 0, @@ -14,13 +10,22 @@ enum feature_property_type FPROP_SANCTUARY_2 = (1 << 2), FPROP_BLOODY = (1 << 3), FPROP_VAULT = (1 << 4), - FPROP_HIGHLIGHT = (1 << 5), // Highlight grids on the X map for debugging. + FPROP_HIGHLIGHT = (1 << 5), // Highlight on the X map for debugging. // NOTE: Bloody floor and sanctuary are exclusive. FPROP_UNUSED = (1 << 6), // used to be force_exclude FPROP_NO_CLOUD_GEN = (1 << 7), FPROP_NO_RTELE_INTO = (1 << 8), FPROP_NO_CTELE_INTO = (1 << 9), - FPROP_NO_TELE_INTO = FPROP_NO_RTELE_INTO | FPROP_NO_CTELE_INTO + FPROP_NO_TELE_INTO = FPROP_NO_RTELE_INTO | FPROP_NO_CTELE_INTO, + + // Squares that the tide should not affect. + FPROP_NO_TIDE = (1 << 10) }; + +bool is_sanctuary(const coord_def& p); +bool is_bloodcovered(const coord_def& p); +bool is_tide_immune(const coord_def &p); +feature_property_type str_to_fprop(const std::string &str); + #endif |