diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 15:49:44 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 15:49:44 +0000 |
commit | da63e2c8a8549ce2e6d0bdb7a44f0862c6d78ff1 (patch) | |
tree | 8e069c66be808c7be2ede3745445b56b18d44274 /crawl-ref/source/spells2.cc | |
parent | e73b14bb597a465a3094d500080905517ca2bba6 (diff) | |
download | crawl-ref-da63e2c8a8549ce2e6d0bdb7a44f0862c6d78ff1.tar.gz crawl-ref-da63e2c8a8549ce2e6d0bdb7a44f0862c6d78ff1.zip |
Add more summoning-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5653 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r-- | crawl-ref/source/spells2.cc | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 6222ac49b7..4a04ba9aa5 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1238,8 +1238,10 @@ bool cast_summon_scorpions(int pow, bool god_gift) { success = true; - mprf("A scorpion appears.%s", - friendly ? "" : " It doesn't look very happy."); + mpr("A scorpion appears."); + + if (!friendly) + mpr("It doesn't look very happy."); } } @@ -1324,8 +1326,10 @@ bool cast_summon_swarm(int pow, bool god_gift, bool force_hostile, if (!quiet) { - mprf("A swarming creature appears!%s", - friendly ? "" : " It doesn't look very happy."); + mpr("A swarming creature appears!"); + + if (!friendly) + mpr("It doesn't look very happy."); } } } @@ -1387,8 +1391,10 @@ bool cast_call_canine_familiar(int pow, bool god_gift) { success = true; - mprf("A canine appears!%s", - friendly ? "" : " It doesn't look very happy."); + mpr("A canine appears!"); + + if (!friendly) + mpr("It doesn't look very happy."); } else canned_msg(MSG_NOTHING_HAPPENS); @@ -1586,9 +1592,11 @@ bool cast_summon_ugly_thing(int pow, bool god_gift) { success = true; - mprf((mon == MONS_VERY_UGLY_THING) ? "A very ugly thing appears.%s" - : "An ugly thing appears.%s", - friendly ? "" : " It doesn't look very happy."); + mpr((mon == MONS_VERY_UGLY_THING) ? "A very ugly thing appears." + : "An ugly thing appears."); + + if (!friendly) + mpr("It doesn't look very happy."); } else canned_msg(MSG_NOTHING_HAPPENS); @@ -1616,8 +1624,10 @@ bool cast_summon_dragon(int pow, bool god_gift) { success = true; - mprf("A dragon appears.%s", - friendly ? "" : " It doesn't look very happy."); + mpr("A dragon appears."); + + if (!friendly) + mpr("It doesn't look very happy."); } else canned_msg(MSG_NOTHING_HAPPENS); |