summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 03:26:09 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-24 03:26:09 +0000
commitda2bfae4d158f57ebb3f4f6d07c54cb7cbd85ba2 (patch)
tree6c9b5aa2a935bee8f2b3e6c00d16058f83400a25 /crawl-ref/source/spells2.cc
parent634ae7d7866440f61bf6d965f4138deb97d1159d (diff)
downloadcrawl-ref-da2bfae4d158f57ebb3f4f6d07c54cb7cbd85ba2.tar.gz
crawl-ref-da2bfae4d158f57ebb3f4f6d07c54cb7cbd85ba2.zip
Simplify.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6100 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index 1fbef13c7e..865bbd514b 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1760,7 +1760,7 @@ bool summon_daeva(int pow, god_type god, bool quiet)
}
bool cast_tukimas_dance(int pow, god_type god,
- bool force_hostile, bool quiet_failure)
+ bool force_hostile)
{
bool success = true;
@@ -1806,17 +1806,14 @@ bool cast_tukimas_dance(int pow, god_type god,
{
destroy_item(i);
- if (!quiet_failure)
+ if (wpn != -1)
{
- if (wpn != -1)
- {
- mprf("%s vibrates crazily for a second.",
- you.inv[wpn].name(DESC_CAP_YOUR).c_str());
- }
- else
- msg::stream << "Your " << your_hand(true) << " twitch."
- << std::endl;
+ mprf("%s vibrates crazily for a second.",
+ you.inv[wpn].name(DESC_CAP_YOUR).c_str());
}
+ else
+ msg::stream << "Your " << your_hand(true) << " twitch."
+ << std::endl;
return (false);
}