summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/abl-show.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-05 13:33:29 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-05 13:33:29 +0000
commitff2f267821153758bcd691e73b1b409c62f0c4e0 (patch)
tree11f18df98aad81ddfa9798dafd67eceb3b4ed510 /crawl-ref/source/abl-show.cc
parent3423bbab5a0f024eeafffe6b8260c8c088647db1 (diff)
downloadcrawl-ref-ff2f267821153758bcd691e73b1b409c62f0c4e0.tar.gz
crawl-ref-ff2f267821153758bcd691e73b1b409c62f0c4e0.zip
Cleaned up monster generation functions, separate monster zombie type from monster number. May be buggy.
Allow hydra zombies (they currently do not get the right number of heads). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4872 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
-rw-r--r--crawl-ref/source/abl-show.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index 0f97a557a9..1ab70b9a0f 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1544,7 +1544,9 @@ static bool _do_ability(const ability_def& abil)
case ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB:
summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,
- MONS_NEQOXEC + random2(5), true );
+ static_cast<monster_type>(
+ MONS_NEQOXEC + random2(5)),
+ true );
exercise(SK_INVOCATIONS, 2 + random2(3));
break;
@@ -1601,7 +1603,8 @@ static bool _do_ability(const ability_def& abil)
case ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB:
summon_ice_beast_etc( 20 + you.skills[SK_INVOCATIONS] * 3,
- MONS_EXECUTIONER + random2(5),
+ static_cast<monster_type>(
+ MONS_EXECUTIONER + random2(5)),
true );
exercise(SK_INVOCATIONS, 6 + random2(6));