diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 22:41:13 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-09 22:41:13 +0000 |
| commit | 764e6d61ac825e6018816541e777f723d500635c (patch) | |
| tree | a7ccf28def49d9540628b20f43629ac6272c284a | |
| parent | e58772fd2ca55dd37f770e93916dabbca26ee140 (diff) | |
| download | crawl-ref-764e6d61ac825e6018816541e777f723d500635c.tar.gz crawl-ref-764e6d61ac825e6018816541e777f723d500635c.zip | |
Tweak summoning-related messages again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5676 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 17 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.h | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ad0dfbcb63..acb6b3ae94 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3143,7 +3143,7 @@ static bool _zin_retribution() else { bool success = cast_summon_swarm(you.experience_level * 20, - true, true, true); + true, true); simple_god_message(success ? " sends a plague down upon you!" : "'s plague fails to arrive.", diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index f3911c93f0..5179e4d245 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1119,9 +1119,6 @@ bool cast_summon_small_mammals(int pow, bool god_gift) god_gift ? MG_GOD_GIFT : 0)) != -1) { success = true; - - if (success) - mpr("A small mammal appears!"); } } @@ -1285,8 +1282,8 @@ bool cast_summon_scorpions(int pow, bool god_gift) return (success); } -bool cast_summon_swarm(int pow, bool god_gift, bool force_hostile, - bool quiet) +bool cast_summon_swarm(int pow, bool god_gift, + bool force_hostile) { bool success = false; @@ -1357,18 +1354,10 @@ bool cast_summon_swarm(int pow, bool god_gift, bool force_hostile, god_gift ? MG_GOD_GIFT : 0)) != -1) { success = true; - - if (!quiet) - { - mpr("A swarming creature appears!"); - - if (!friendly) - mpr("It doesn't look very happy."); - } } } - if (!quiet && !success) + if (!success) canned_msg(MSG_NOTHING_HAPPENS); return (success); diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h index 5716d35098..9bee716e1d 100644 --- a/crawl-ref/source/spells2.h +++ b/crawl-ref/source/spells2.h @@ -120,7 +120,7 @@ bool cast_summon_scorpions(int pow, bool god_gift = false); * called from: ability - religion - spell * *********************************************************************** */ bool cast_summon_swarm(int pow, bool god_gift = false, - bool force_hostile = false, bool quiet = false); + bool force_hostile = false); // last updated 24may2000 {dlb} /* *********************************************************************** |