diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-14 23:42:00 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-14 23:42:00 +0000 |
commit | 8a369e0e98d2611fb67a4636e26cebb82aa0b432 (patch) | |
tree | fb2cc50f605745040d09f676be8cefccadc05aef /crawl-ref/source | |
parent | d5a459111e73159720455c50ab27366ffaded5d5 (diff) | |
download | crawl-ref-8a369e0e98d2611fb67a4636e26cebb82aa0b432.tar.gz crawl-ref-8a369e0e98d2611fb67a4636e26cebb82aa0b432.zip |
Add still more miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9486 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/spells3.cc | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 7d6eeafdde..f616216576 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -597,41 +597,44 @@ bool cast_summon_horrible_things(int pow, god_type god) while (how_many_big > 0) { - if (create_monster( + const int monster = + create_monster( mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY, 6, SPELL_SUMMON_HORRIBLE_THINGS, you.pos(), MHITYOU, - 0, god)) != -1) + 0, god)); + + if (monster != -1) { count++; - } + how_many_big--; - how_many_big--; + player_angers_monster(&menv[monster]); + } } while (how_many_small > 0) { - if (create_monster( + const int monster = + create_monster( mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY, 6, SPELL_SUMMON_HORRIBLE_THINGS, you.pos(), MHITYOU, - 0, god)) != -1) + 0, god)); + + if (monster != -1) { count++; - } + how_many_small--; - how_many_small--; + player_angers_monster(&menv[monster]); + } } - if (count > 0) - { - mprf("Some thing%s answered your call!", - count > 1 ? "s" : ""); - return (true); - } + if (count == 0) + mpr("Your call goes unanswered."); - mpr("Your call goes unanswered."); - return (false); + return (count > 0); } static bool _animatable_remains(const item_def& item) @@ -1022,7 +1025,7 @@ bool cast_simulacrum(int pow, god_type god) } if (count == 0) - canned_msg(MSG_NOTHING_HAPPENS); + mpr("You feel cold for a second."); } else { |