summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-17 19:11:53 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-04-17 19:11:53 +0000
commita15e97c27cb553d4a87c617da163ef7c1a68f6ec (patch)
treea87d3432dedf443d4449969c39cddfd1fae08363 /crawl-ref/source/spells3.cc
parent309836923b804cab00ad345aef3e04b6a506ca33 (diff)
downloadcrawl-ref-a15e97c27cb553d4a87c617da163ef7c1a68f6ec.tar.gz
crawl-ref-a15e97c27cb553d4a87c617da163ef7c1a68f6ec.zip
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9602 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 1501a89b04..083bb9ad3a 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -631,7 +631,7 @@ bool cast_summon_horrible_things(int pow, god_type god)
mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY,
6, SPELL_SUMMON_HORRIBLE_THINGS,
you.pos(), MHITYOU,
- 0, god));
+ MG_FORCE_BEH, god));
if (monster != -1)
{
@@ -1010,7 +1010,9 @@ bool cast_simulacrum(int pow, god_type god)
|| (weapon->base_type == OBJ_FOOD
&& weapon->sub_type == FOOD_CHUNK)))
{
- const monster_type mon = static_cast<monster_type>(weapon->plus);
+ const monster_type type = static_cast<monster_type>(weapon->plus);
+ const monster_type sim_type = mons_zombie_size(type) == Z_BIG ?
+ MONS_SIMULACRUM_LARGE : MONS_SIMULACRUM_SMALL;
// Can't create more than the available chunks.
int how_many = std::min(8, 4 + random2(pow) / 20);
@@ -1020,10 +1022,10 @@ bool cast_simulacrum(int pow, god_type god)
{
const int monster =
create_monster(
- mgen_data(MONS_SIMULACRUM_SMALL, BEH_FRIENDLY,
+ mgen_data(sim_type, BEH_FRIENDLY,
6, SPELL_SIMULACRUM,
you.pos(), MHITYOU,
- MG_FORCE_BEH, god, mon));
+ MG_FORCE_BEH, god, type));
if (monster != -1)
{