From 8d1fa5916d012588e2eaa62fcdcc62768dcb86e1 Mon Sep 17 00:00:00 2001 From: Darshan Shaligram Date: Sun, 17 Jan 2010 11:28:50 +0530 Subject: 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. --- crawl-ref/source/mapdef.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/mapdef.cc') 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(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); } -- cgit v1.2.3-54-g00ecf