summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/mon-data.h2
-rw-r--r--crawl-ref/source/mon-stuff.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 9d54b5f5e9..1bfe635934 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3585,7 +3585,7 @@ static monsterentry mondata[] = {
MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM
},
-{ // another dummy monster
+{ // another dummy monster. This one is not a valid polymorph target.
MONS_DWARF, '@', BROWN, "dwarf",
M_WARM_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc
index 68c98abb4f..92d9716056 100644
--- a/crawl-ref/source/mon-stuff.cc
+++ b/crawl-ref/source/mon-stuff.cc
@@ -2280,7 +2280,9 @@ static bool _valid_morph(monsters *monster, monster_type new_mclass)
// Other poly-unsuitable things.
|| new_mclass == MONS_ORB_GUARDIAN
+ || new_mclass == MONS_DWARF
|| mons_is_statue(new_mclass)
+ || mons_is_projectile(new_mclass)
// The spell on Prince Ribbit can't be broken so easily.
|| (new_mclass == MONS_HUMAN && monster->type == MONS_PRINCE_RIBBIT))