diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-29 06:09:08 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-12-29 06:09:08 +0000 |
| commit | c714dc52a577aad6a815f5b4372988821bd360a3 (patch) | |
| tree | d264824b3245bcbbfa823ca465f2bed8843f76bb /crawl-ref/source | |
| parent | 3fb9177a9fe1b81c2cc75d6f4e92cc893955c013 (diff) | |
| download | crawl-ref-c714dc52a577aad6a815f5b4372988821bd360a3.tar.gz crawl-ref-c714dc52a577aad6a815f5b4372988821bd360a3.zip | |
[1623449] Fixed monsters trying to teleport when already in the process of teleporting.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@717 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 8fb825aab2..a5699afd4d 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -2820,7 +2820,7 @@ static bool handle_scroll(struct monsters *monster) switch (mitm[monster->inv[MSLOT_SCROLL]].sub_type) { case SCR_TELEPORTATION: - if (!mons_has_ench(monster, ENCH_TP_I)) + if (!mons_has_ench(monster, ENCH_TP_I, ENCH_TP_IV)) { if (monster->behaviour == BEH_FLEE) { @@ -2982,7 +2982,8 @@ static bool handle_wand(struct monsters *monster, bolt &beem) case WAND_TELEPORTATION: if (monster->hit_points <= monster->max_hit_points / 2) { - if (!mons_has_ench(monster, ENCH_TP_I) && !one_chance_in(20)) + if (!mons_has_ench(monster, ENCH_TP_I, ENCH_TP_IV) + && !one_chance_in(20)) { beem.target_x = monster->x; beem.target_y = monster->y; |