diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 03:16:43 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-02 03:16:43 +0000 |
| commit | 75af077e082b2bcc4d29c42ef88af3fc4e3f0805 (patch) | |
| tree | 264d7e9d40413d80cb868128be6b956a808248bf /crawl-ref/source | |
| parent | bae76b75322be53a8109b52f4ce8cf749ad43953 (diff) | |
| download | crawl-ref-75af077e082b2bcc4d29c42ef88af3fc4e3f0805.tar.gz crawl-ref-75af077e082b2bcc4d29c42ef88af3fc4e3f0805.zip | |
Add more miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5426 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 13 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index bbff0afdd4..d79233cc63 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -3475,10 +3475,10 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) break; case MONS_MANTICORE: - if (!mons_player_visible( monster )) + if (monster->has_ench(ENCH_CONFUSION)) break; - if (monster->has_ench(ENCH_CONFUSION)) + if (!mons_player_visible( monster )) break; if (is_sanctuary(you.x_pos, you.y_pos) @@ -3487,9 +3487,6 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) break; } - if (!mons_near(monster)) - break; - // The fewer spikes the manticore has left, the less // likely it will use them. if (random2(16) >= static_cast<int>(monster->number)) @@ -3550,10 +3547,10 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) case MONS_XTAHUA: case MONS_WHITE_DRACONIAN: case MONS_RED_DRACONIAN: - if (!mons_player_visible( monster )) + if (monster->has_ench(ENCH_CONFUSION)) break; - if (monster->has_ench(ENCH_CONFUSION)) + if (!mons_player_visible( monster )) break; if (is_sanctuary(you.x_pos, you.y_pos) @@ -3632,7 +3629,7 @@ static bool _handle_special_ability(monsters *monster, bolt & beem) { simple_monster_message(monster, make_stringf(" chants %s song.", - already_beheld? "her luring" : "a haunting").c_str(), + already_beheld ? "her luring" : "a haunting").c_str(), spl); } else diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 7700c05f30..3f5322e893 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -956,7 +956,6 @@ void setup_mons_cast(const monsters *monster, struct bolt &pbolt, int spell_cast } } // end setup_mons_cast() - void monster_teleport(struct monsters *monster, bool instan, bool silent) { if (!instan) |