fiddlerwoaroof/crawl - Change JMRV4P4X6OCLRDXDYRYOT7VTTQXZ6XWW56SO6YQGIUC4VNXGR72AC

Allow monsters that can't swim or drown (e.g. the Royal Jelly) which

have been dumped into deep water (e.g. by the Water card) to move along the bottom in order to get out. Fixes [2519093].

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8985 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on February 8, 2009

JMRV4P4X6OCLRDXDYRYOT7VTTQXZ6XWW56SO6YQGIUC4VNXGR72AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/terrain.cc at line 510 [3.26938]

B:BD[3.37333] → [3.37333:37398]

B:BD[3.37398] → [4.1220:1270]

    const int mindex = mgrd(pos);
    if (mindex != NON_MONSTER)
        menv[mindex].apply_location_effects(pos);

[3.37333]

[5.361]

    if (monsters* m = monster_at(pos))
        m->apply_location_effects(pos);

Replacement in crawl-ref/source/monstuff.cc at line 7108 [7.1396662]

B:BD[6.3373] → [2.4992:5060]

        if (mons_is_lurking(monster) || mons_is_submerged(monster))

[6.3373]

[6.3417]

        // Lurking monsters only stop lurking if their target is right
        // next to them, otherwise they just sit there.
        // However, if the monster is involuntarily submerged but
        // still alive (e.g., nonbreathing which had water poured
        // on top of it), this doesn't apply.
        if (mons_is_lurking(monster) || monster->has_ench(ENCH_SUBMERGED))

Deletion in crawl-ref/source/monstuff.cc at line 7115 [7.1396662]

B:BD[6.3427] → [6.3427:3502]

B:BD[6.3502] → [8.2890:2950]

            // Lurking monsters only stop lurking if their target is right
            // next to them, otherwise they just sit there.

Replacement in crawl-ref/source/monstuff.cc at line 8075 [7.1396662]

B:BD[9.6499] → [9.6499:6555]

        const int thismonster = monster_index(monster),

[9.6499]

[10.32121]

        const int thismonster = monster->mindex(),

Replacement in crawl-ref/source/monstuff.cc at line 8078 [7.1396662]

∅:D[11.10868] → [9.6609:6736]

B:BD[9.6609] → [9.6609:6736]

        if (mons_aligned(thismonster, targmonster)
            && targmonster != MHITNOT
            && targmonster != MHITYOU

[11.10868]

[12.10285]

        if (!invalid_monster_index(targmonster)
            && mons_aligned(thismonster, targmonster)