diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:19:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-14 18:19:16 +0000 |
| commit | 8760aefa6b0c601891cb580f638a31696ec90107 (patch) | |
| tree | 30d1f4c34cf1931d06d94c674341c3bba17f0299 /crawl-ref/source/stuff.cc | |
| parent | 866686d5df24c38a2838f6f06ef9186b2c392a1c (diff) | |
| download | crawl-ref-8760aefa6b0c601891cb580f638a31696ec90107.tar.gz crawl-ref-8760aefa6b0c601891cb580f638a31696ec90107.zip | |
* Add a prompt when attacking monsters with an inappropriate weapon or
when attempting to use (controlled) berserk while wielding an
inappropriate weapon. (FR 1956656)
* Make monsters stop patrolling/travelling if they change levels (or are
banished).
* Disable the friendly pickup toggle for characters unable to use them.
Currently, only worshippers of TSO and Beogh are capable of gaining
allies that are permanent (not summoned), permanently friendly (not
charmed) and intelligent enough to pick up stuff (no zombies). I don't
know if you keep your friends if you leave TSO. If so, the toggle
should be enabled while that is the case (i.e. if you're still
worshipping a good god)
* Re-order the wizmode commands in the help screen. They're now not
listed strictly alphabetically anymore, but rather sorted into
different categories that should make actually finding commands easier.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5819 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/stuff.cc')
| -rw-r--r-- | crawl-ref/source/stuff.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index 802ad57cf1..68b31a0e0d 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -243,7 +243,7 @@ static bool tag_follower_at(const coord_def &pos) if (fmenv->speed_increment < 50) return (false); - // only friendly monsters, or those actively seeking the + // Only friendly monsters, or those actively seeking the // player, will follow up/down stairs. if (!mons_friendly(fmenv) && (fmenv->behaviour != BEH_SEEK || fmenv->foe != MHITYOU)) @@ -266,9 +266,14 @@ static bool tag_follower_at(const coord_def &pos) } } - // monster is chasing player through stairs: + // Monster is chasing player through stairs. fmenv->flags |= MF_TAKING_STAIRS; + // Clear patrolling/travel markers. + fmenv->patrol_point = coord_def(0,0); + fmenv->travel_path.clear(); + fmenv->travel_target = MTRAV_NONE; + #if DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "%s is marked for following.", fmenv->name(DESC_CAP_THE, true).c_str() ); |