summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dungeon.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-05 16:57:06 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-10-05 16:57:06 +0000
commit341e6e03d6347b96c54d6a295c81070d13ea9152 (patch)
treea3ae8acf43aef5d54ca2ac697636a75af34a3497 /crawl-ref/source/dungeon.cc
parent90451abc4f59c5b9ddad812d08ba2355da07213f (diff)
downloadcrawl-ref-341e6e03d6347b96c54d6a295c81070d13ea9152.tar.gz
crawl-ref-341e6e03d6347b96c54d6a295c81070d13ea9152.zip
Add still more miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7139 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dungeon.cc')
-rw-r--r--crawl-ref/source/dungeon.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 06a2193657..fc35399d36 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4651,12 +4651,13 @@ bool dgn_place_monster(mons_spec &mspec,
if (mons_is_unique(mid) && you.unique_creatures[mid])
return (false);
- const int type = mons_class_is_zombified(mid) ? mspec.monbase
- : mid;
+ const int montype = mons_class_is_zombified(mid) ? mspec.monbase
+ : mid;
+
+ const habitat_type habitat = mons_habitat_by_type(montype);
- const habitat_type habitat = mons_habitat_by_type(type);
if (habitat != HT_LAND
- && (habitat != HT_WATER || !mons_class_amphibious(mid)))
+ && (habitat != HT_WATER || !mons_class_amphibious(montype)))
{
grd(where) = habitat2grid(habitat);
}