summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monspeak.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-20 10:41:45 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-20 10:41:45 +0000
commit9c8871bc3e50d51e3898ff5594b9d4f73f15c55b (patch)
tree1f440752e7877fb9e626fa44c35d82d154939d73 /crawl-ref/source/monspeak.cc
parent68b3b5ac3474ceac470591c2a19e8e15b7d9d2ee (diff)
downloadcrawl-ref-9c8871bc3e50d51e3898ff5594b9d4f73f15c55b.tar.gz
crawl-ref-9c8871bc3e50d51e3898ff5594b9d4f73f15c55b.zip
Make extra-sure that a monster won't be announced to have come into view, only
to immediately move out of view, by introducing the notion of the currently acting monster to crawl_state, and only flushing out the "comes into view" message in mpr() for the currently acting monster. Not sure if it's worth it just for the sake of avoiding doing a "has this monster just now come into view" check in every place that a monster might issue a message, but at least this way we won't miss any places such a check should be placed. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8623 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monspeak.cc')
-rw-r--r--crawl-ref/source/monspeak.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc
index b147cf3fa5..448a8c1017 100644
--- a/crawl-ref/source/monspeak.cc
+++ b/crawl-ref/source/monspeak.cc
@@ -737,6 +737,8 @@ void mons_speaks_msg(const monsters *monster, const std::string &msg,
if (!mons_near(monster))
return;
+ mon_acting mact(const_cast<monsters*>(monster));
+
// We have a speech string, now parse and act on it.
std::string _msg = do_mon_str_replacements(msg, monster);