summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-speak.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-02-08 11:17:19 -0700
committerSteve Melenchuk <smelenchuk@gmail.com>2014-02-08 11:19:45 -0700
commit211950a05e6715eecf61179df90b24b96e630fd0 (patch)
treef5aff487425f9e73a390dbe03ade3f92eaba8d00 /crawl-ref/source/mon-speak.cc
parente27c932d66788c0fd30303e6fa220751dc21a71c (diff)
downloadcrawl-ref-211950a05e6715eecf61179df90b24b96e630fd0.tar.gz
crawl-ref-211950a05e6715eecf61179df90b24b96e630fd0.zip
Let non-Natasha monster felids revive as well.
Contains handling to make sure they revive exactly twice (three lives in total). This is intended to be on hand for if one of the suggested uses of monster felids goes through. The code for this will need updating if/when we get other enemy felids.
Diffstat (limited to 'crawl-ref/source/mon-speak.cc')
-rw-r--r--crawl-ref/source/mon-speak.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc
index 5daac51836..b85b3b4f5c 100644
--- a/crawl-ref/source/mon-speak.cc
+++ b/crawl-ref/source/mon-speak.cc
@@ -22,6 +22,7 @@
#include "ghost.h"
#include "libutil.h"
#include "message.h"
+#include "mon-death.h"
#include "mon-util.h"
#include "monster.h"
#include "player.h"
@@ -297,7 +298,7 @@ static string _get_speak_string(const vector<string> &prefixes,
if (mons->hit_points <= 0)
{
//let her have separate death/permadeath lines
- if (mons->type == MONS_NATASHA && mons->hit_dice == 1)
+ if (mons_is_natasha(mons) && !mons_felid_can_revive(mons))
key += " permanently";
key += " killed";
}