summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/maps.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-26 10:39:39 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-26 10:39:39 +0000
commit61cae4a761c2f72cda44ae269c7007b37a0c14a7 (patch)
treefec8ec71ca7ca6eebd9d48881bc5ee3fe27d04c1 /crawl-ref/source/maps.cc
parentd4acdf4a6a4b73607d58714a66efd372674adb56 (diff)
downloadcrawl-ref-61cae4a761c2f72cda44ae269c7007b37a0c14a7.tar.gz
crawl-ref-61cae4a761c2f72cda44ae269c7007b37a0c14a7.zip
Misc. minor cleanups. (Yes, a huge amount of them but still...)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6146 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/maps.cc')
-rw-r--r--crawl-ref/source/maps.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 518037e585..426136969b 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -318,6 +318,7 @@ static bool map_has_no_tags(const map_def &map, I begin, I end)
for ( ; begin != end; ++begin)
if (map.has_tag(*begin))
return (false);
+
return (true);
}
@@ -331,7 +332,7 @@ static bool vault_unforbidden(const map_def &map)
static bool map_matches_layout_type(const map_def &map)
{
if (dgn_Layout_Type.empty() || !map.has_tag_prefix("layout_"))
- return true;
+ return (true);
return map.has_tag("layout_" + dgn_Layout_Type);
}
@@ -341,6 +342,7 @@ int find_map_by_name(const std::string &name)
for (unsigned i = 0, size = vdefs.size(); i < size; ++i)
if (vdefs[i].name == name)
return (i);
+
return (-1);
}