diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-21 17:02:35 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-21 17:02:35 +0000 |
| commit | 01e87f9679a3c5bf2ce3e45c59d7c7df97644940 (patch) | |
| tree | cb8652227fe34d8d164b999ab704616973193ae6 /crawl-ref/source/spells1.cc | |
| parent | ca2fa8e5208ae5882a352193dcbdca194c59e3b7 (diff) | |
| download | crawl-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/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 8b1d90d9a4..95de265140 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -151,7 +151,8 @@ int blink(int pow, bool high_level_controlled_blink, bool wizard_blink) else if (you.level_type == LEVEL_ABYSS && !wizard_blink) { abyss_teleport( false ); - you.pet_target = MHITNOT; + if (you.pet_target != MHITYOU) + you.pet_target = MHITNOT; } else { @@ -222,7 +223,8 @@ void random_blink(bool allow_partial_control, bool override_abyss) if (you.level_type == LEVEL_ABYSS) { abyss_teleport( false ); - you.pet_target = MHITNOT; + if (you.pet_target != MHITYOU) + you.pet_target = MHITNOT; } } |