summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dgn-shoals.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-30 00:35:33 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2009-12-30 00:36:59 +0530
commit884a020ab85f131212638b07913f9ec749c9ecb2 (patch)
tree97c930f2ee6c5aa110fe0b36ba0ca1d8923fd029 /crawl-ref/source/dgn-shoals.cc
parent0822d05b5a0597c3521a9440997e37b217b2cdb0 (diff)
downloadcrawl-ref-884a020ab85f131212638b07913f9ec749c9ecb2.tar.gz
crawl-ref-884a020ab85f131212638b07913f9ec749c9ecb2.zip
More call tide fixes: don't flash view if Ilsuiw is not in LOS, apply tide reset even if the player is not messaged about it.
Diffstat (limited to 'crawl-ref/source/dgn-shoals.cc')
-rw-r--r--crawl-ref/source/dgn-shoals.cc13
1 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/dgn-shoals.cc b/crawl-ref/source/dgn-shoals.cc
index b91dc3a195..f48a146266 100644
--- a/crawl-ref/source/dgn-shoals.cc
+++ b/crawl-ref/source/dgn-shoals.cc
@@ -1116,12 +1116,15 @@ void shoals_apply_tides(int turns_elapsed, bool force)
void shoals_release_tide(monsters *mons)
{
- if (player_in_branch(BRANCH_SHOALS)
- && player_can_hear(you.pos()))
+ if (player_in_branch(BRANCH_SHOALS))
{
- mprf(MSGCH_SOUND, "The tide is released from %s call.",
- mons->name(DESC_NOCAP_YOUR, true).c_str());
- flash_view_delay(ETC_WATER, 150);
+ if (player_can_hear(mons->pos()))
+ {
+ mprf(MSGCH_SOUND, "The tide is released from %s call.",
+ mons->name(DESC_NOCAP_YOUR, true).c_str());
+ if (you.see_cell(mons->pos()))
+ flash_view_delay(ETC_WATER, 150);
+ }
shoals_apply_tides(0, true);
}
}