summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells4.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-21 17:02:35 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-21 17:02:35 +0000
commit01e87f9679a3c5bf2ce3e45c59d7c7df97644940 (patch)
treecb8652227fe34d8d164b999ab704616973193ae6 /crawl-ref/source/spells4.cc
parentca2fa8e5208ae5882a352193dcbdca194c59e3b7 (diff)
downloadcrawl-ref-01e87f9679a3c5bf2ce3e45c59d7c7df97644940.tar.gz
crawl-ref-01e87f9679a3c5bf2ce3e45c59d7c7df97644940.zip
Add mesilliac's patch in [1944555] for improved handling of
followers/summoned creatures, with one minor tweak to take good neutral monsters into account. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4444 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells4.cc')
-rw-r--r--crawl-ref/source/spells4.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 1563b48d54..8f978e68c5 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -2795,7 +2795,8 @@ static int quadrant_blink(int x, int y, int pow, int garbage)
if (you.level_type == LEVEL_ABYSS)
{
abyss_teleport( false );
- you.pet_target = MHITNOT;
+ if (you.pet_target != MHITYOU)
+ you.pet_target = MHITNOT;
return (1);
}