summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-25 16:27:02 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-02-25 16:27:02 +0000
commit3c0facbc262ecdc02e714d22fcfcadc938816b2a (patch)
tree6916e0b2e457ec1af02d7da380f26403bddbf86b /crawl-ref/source/fight.cc
parentf10f789ac24d807aecbacb8b081eeaab59abc4f9 (diff)
downloadcrawl-ref-3c0facbc262ecdc02e714d22fcfcadc938816b2a.tar.gz
crawl-ref-3c0facbc262ecdc02e714d22fcfcadc938816b2a.zip
Give Angels and Daevas see invisible.
Fixed duplication of monster special attack messages. Fixed typo s/auro/aura/. Increased chance of monster not moving when confused. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@968 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index fe7e7cf6df..b13b67101b 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2326,7 +2326,7 @@ bool melee_attack::mons_attack_warded_off()
{
if (needs_message)
{
- mprf("%s tries to attack %s, but is repelled by %s holy auro.",
+ mprf("%s tries to attack %s, but is repelled by %s holy aura.",
atk->name(DESC_CAP_THE).c_str(),
defender->name(DESC_NOCAP_THE).c_str(),
defender->pronoun(PRONOUN_NOCAP_POSSESSIVE).c_str());
@@ -2798,12 +2798,6 @@ void melee_attack::mons_apply_attack_flavour(const mon_attack_def &attk)
void melee_attack::mons_perform_attack_rounds()
{
const int nrounds = atk->type == MONS_HYDRA? atk->number : 4;
-#ifdef DEBUG_DIAGNOSTICS
- mprf(MSGCH_DIAGNOSTICS, "%s gets %d attacks",
- attacker->name(DESC_CAP_THE).c_str(),
- nrounds);
-#endif
-
const coord_def pos = defender->pos();
for (attack_number = 0; attack_number < nrounds; ++attack_number)
@@ -2895,6 +2889,7 @@ void melee_attack::mons_perform_attack_rounds()
return;
special_damage = 0;
+ special_damage_message.clear();
apply_damage_brand();
if (!special_damage_message.empty())