diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2010-01-17 11:28:50 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2010-01-17 11:28:50 +0530 |
| commit | 8d1fa5916d012588e2eaa62fcdcc62768dcb86e1 (patch) | |
| tree | 2767c7dc72667e8ce9197dae92382a5043642a5b /crawl-ref/source/mapdef.cc | |
| parent | c4246fc216beca0282bf281274a3756a10086f87 (diff) | |
| download | crawl-ref-8d1fa5916d012588e2eaa62fcdcc62768dcb86e1.tar.gz crawl-ref-8d1fa5916d012588e2eaa62fcdcc62768dcb86e1.zip | |
Add FPROP_NO_TIDE to tell the tide not to touch certain squares.
Wizmode &( now accepts fprop names to set the fprop on the current square.
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
| -rw-r--r-- | crawl-ref/source/mapdef.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 09b233fc53..8f6f2fa02d 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -996,7 +996,8 @@ void map_lines::overlay_fprops(fprop_spec &spec) for (int y = 0, ysize = lines.size(); y < ysize; ++y) { std::string::size_type pos = 0; - while ((pos = lines[y].find_first_of(spec.key, pos)) != std::string::npos) + while ((pos = lines[y].find_first_of(spec.key, pos)) + != std::string::npos) { (*overlay)(pos, y).property |= spec.get_property(); ++pos; @@ -3147,7 +3148,7 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec) summon_type = static_cast<int>(str_to_summon_type(s_type)); if (summon_type == SPELL_NO_SPELL) { - error = make_stringf("bad monster summon type: \"%s\"", + error = make_stringf("bad monster summon type: \"%s\"", s_type.c_str()); return (slot); } |