summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-27 13:03:30 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-27 13:03:30 +0000
commitd360a8a9373ac6d5760d1869617685d553c7b9fb (patch)
tree37793c8c7f1da45003df524d91a5fb0b19d61de2
parent43518236036483ba293dd97c2a84b15383671ae2 (diff)
downloadcrawl-ref-d360a8a9373ac6d5760d1869617685d553c7b9fb.tar.gz
crawl-ref-d360a8a9373ac6d5760d1869617685d553c7b9fb.zip
For amphibious creatures with HT_WATER, don't force replacing floor compatible
terrain with deep water when placing them by map definition or in wizard mode. (Suggested in BR 2000631.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6168 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dungeon.cc5
-rw-r--r--crawl-ref/source/monplace.cc1
2 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 3aee3dde2f..09cd0d6cce 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4576,8 +4576,11 @@ bool dgn_place_monster(mons_spec &mspec,
: mid;
const habitat_type habitat = mons_habitat_by_type(type);
- if (habitat != HT_LAND)
+ if (habitat != HT_LAND
+ && (habitat != HT_WATER || !mons_class_amphibious(mid)))
+ {
grd[vx][vy] = habitat2grid(habitat);
+ }
}
mgen_data mg(static_cast<monster_type>(mid));
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 2dc7a664ae..a85f16e72e 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -217,6 +217,7 @@ static void _hell_spawn_random_monsters()
viewwindow(true, false);
}
}
+
//#define DEBUG_MON_CREATION
void spawn_random_monsters()
{