summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.h
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 14:32:02 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-06 14:32:02 +0000
commit8dbcc4dbe18b959b2eab5a2c20aac3f97c6179f9 (patch)
tree43dcc1b16a420b31b645bbafc938c0c0a3d1b03d /crawl-ref/source/fight.h
parent31fb4f573fea4f4ebcceb1f4fcfc478daa0897dc (diff)
downloadcrawl-ref-8dbcc4dbe18b959b2eab5a2c20aac3f97c6179f9.tar.gz
crawl-ref-8dbcc4dbe18b959b2eab5a2c20aac3f97c6179f9.zip
Restore a monster's attitude from the beginning of the attack if it
changes during the attack and the monster is about to die, so that you don't get Okawaru piety for killing an ally just before you receive the penance. Fixes [2436051]. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8925 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.h')
-rw-r--r--crawl-ref/source/fight.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 9786a8ba7c..e4048e6f9f 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -80,6 +80,9 @@ public:
bool attacker_visible, defender_visible;
bool attacker_invisible, defender_invisible;
+ // What was the monster's attitude when the attack began?
+ mon_attitude_type defender_starting_attitude;
+
bool unarmed_ok;
int attack_number;