summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 18:23:57 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-14 18:23:57 +0000
commit9f473ab4bb2c7c7bc2f658da9b14173e011ec84b (patch)
treea8453f1b50fb6a7fa8fc098ac99331cdf7871321 /crawl-ref/source/effects.cc
parent317b5be68b9a0bb5352a2e756fe956cf9aed986b (diff)
downloadcrawl-ref-9f473ab4bb2c7c7bc2f658da9b14173e011ec84b.tar.gz
crawl-ref-9f473ab4bb2c7c7bc2f658da9b14173e011ec84b.zip
All 't' commands now take a turn. [2094024]
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6929 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 0cb9c18977..2c41b60bb3 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -1916,7 +1916,7 @@ void yell(bool force)
if (!you.duration[DUR_BERSERKER])
{
- std::string previous = "";
+ std::string previous;
if (!(you.prev_targ == MHITNOT || you.prev_targ == MHITYOU))
{
monsters *target = &menv[you.prev_targ];
@@ -2021,6 +2021,7 @@ void yell(bool force)
return;
}
+ you.turn_is_over = true;
you.pet_target = mons_targd;
// Allow patrolling for "Stop fighting!" and "Wait here!"
_set_friendly_foes(keyn == 's' || keyn == 'w');