summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fprop.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fprop.cc')
-rw-r--r--crawl-ref/source/fprop.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/fprop.cc b/crawl-ref/source/fprop.cc
index 5ab09c5279..de4f5e2dde 100644
--- a/crawl-ref/source/fprop.cc
+++ b/crawl-ref/source/fprop.cc
@@ -24,7 +24,12 @@ bool is_bloodcovered(const coord_def& p)
return (testbits(env.pgrid(p), FPROP_BLOODY));
}
-int str_to_fprop ( const std::string &str)
+bool is_tide_immune(const coord_def &p)
+{
+ return (env.pgrid(p) & FPROP_NO_TIDE);
+}
+
+feature_property_type str_to_fprop(const std::string &str)
{
if (str == "bloody")
return (FPROP_BLOODY);
@@ -36,8 +41,8 @@ int str_to_fprop ( const std::string &str)
return (FPROP_NO_CTELE_INTO);
if (str == "no_tele_into")
return (FPROP_NO_TELE_INTO);
+ if (str == "no_tide")
+ return (FPROP_NO_TIDE);
return (FPROP_NONE);
}
-
-