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.cc | |
| 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.cc')
| -rw-r--r-- | crawl-ref/source/fprop.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/fprop.cc b/crawl-ref/source/fprop.cc index 2d08949524..782b7a318f 100644 --- a/crawl-ref/source/fprop.cc +++ b/crawl-ref/source/fprop.cc @@ -50,6 +50,8 @@ feature_property_type str_to_fprop(const std::string &str) return (FPROP_NO_TELE_INTO); if (str == "no_tide") return (FPROP_NO_TIDE); + if (str == "no_submerge") + return (FPROP_NO_SUBMERGE); return (FPROP_NONE); } |