diff options
| -rw-r--r-- | crawl-ref/source/spells2.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index f866662863..7aa49c2a55 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1483,7 +1483,7 @@ bool summon_berserker(int pow, god_type god, int spell, else if (pow <= 180) { // trolls - switch(random2(8)) + switch (random2(8)) { case 0: mon = MONS_DEEP_TROLL; diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index f356f34e4c..8ee9e5e357 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -564,6 +564,7 @@ bool cast_shadow_creatures(god_type god) } player_angers_monster(&menv[monster]); + return (true); } @@ -1006,25 +1007,23 @@ bool cast_simulacrum(int pow, god_type god) for (int i = 0; i < how_many; ++i) { - if (create_monster( + const int monster = + create_monster( mgen_data(MONS_SIMULACRUM_SMALL, BEH_FRIENDLY, 6, SPELL_SIMULACRUM, you.pos(), MHITYOU, - 0, god, mon)) != -1) + 0, god, mon)); + + if (monster != -1) { count++; + + player_angers_monster(&menv[monster]); } } - if (count > 0) - { - mprf("%s icy figure%s form%s before you!", - count > 1 ? "Some" : "An", count > 1 ? "s" : "", - count > 1 ? "" : "s"); - rc = true; - } - else - mpr("You feel cold for a second."); + if (count == 0) + canned_msg(MSG_NOTHING_HAPPENS); } else { |