summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-03-06 15:10:53 -0500
committerShmuale Mark <shm.mark@gmail.com>2014-03-06 15:19:26 -0500
commit4f994348c93d311d2beaf58f24822d011c5afefa (patch)
tree1d6f994b8f17d77b7c46d7077ac055022bd7b1c9 /crawl-ref/source/misc.cc
parent64060d9ddb113ae029b828f1aa10c80b673d7ff2 (diff)
downloadcrawl-ref-4f994348c93d311d2beaf58f24822d011c5afefa.tar.gz
crawl-ref-4f994348c93d311d2beaf58f24822d011c5afefa.zip
Rename unchivalric_attack_type and friends.
The enum values were never checked in any code relating to chivalry, except to see that a value wasn't 0 (ie it was a forbidden stab). A recent bug arose from the bad naming, too.
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index a40cc2d4e0..ebf88c5d8e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2262,7 +2262,7 @@ bool bad_attack(const monster *mon, string& adj, string& suffix,
return true;
}
- if (is_unchivalric_attack(&you, mon)
+ if (find_stab_type(&you, mon) != STAB_NO_STAB
&& you_worship(GOD_SHINING_ONE)
&& !tso_unchivalric_attack_safe_monster(mon))
{