summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-24 11:38:36 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-24 11:38:36 +0000
commit5d4fe273007fa5c1e0914e82370146463841c07a (patch)
treefdfe29bfa2987ee88661e023fdcdc90cbcf00a21 /crawl-ref/source/fight.cc
parent5e887cdbaca92e5706d363c22fafbe10c0de669b (diff)
downloadcrawl-ref-5d4fe273007fa5c1e0914e82370146463841c07a.tar.gz
crawl-ref-5d4fe273007fa5c1e0914e82370146463841c07a.zip
Fixed buggy unarmed attack messaging.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1926 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0e8096a8d4..83c306ef22 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -165,7 +165,8 @@ static int maybe_random2( int x, bool random_factor )
// Returns the to-hit for your extra unarmed.attacks.
// DOES NOT do the final roll (i.e., random2(your_to_hit)).
-static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK, bool vampiric = false)
+static int calc_your_to_hit_unarmed(int uattack = UNAT_NO_ATTACK,
+ bool vampiric = false)
{
int your_to_hit;
@@ -589,8 +590,11 @@ bool melee_attack::player_aux_unarmed()
for (int scount = 0; scount < 5; scount++)
{
unarmed_attack.clear();
+ miss_verb.clear();
+ simple_miss_message = false;
damage_brand = SPWPN_NORMAL;
aux_damage = 0;
+
bool vampiric = false;
switch (scount)
@@ -768,8 +772,6 @@ bool melee_attack::player_aux_unarmed()
}
unarmed_attack = "bite";
-// simple_miss_message = true;
-
aux_damage += you.mutation[MUT_FANGS] * 2;
// prob: 1/4 when non-hungry, 1/2 when hungry, 100% when starving
@@ -788,7 +790,6 @@ bool melee_attack::player_aux_unarmed()
/* To add more, add to while part of loop below as well */
default:
continue;
-
}
// unified to-hit calculation