fiddlerwoaroof/crawl - Change XI7U6RL6MFTH6SZQMLO4XFWGXGIFJBCRT6ZFCJFR2B2MGRSKDDCAC

Fix the display of monsters in the tiles minimap. (My mistake, sorry.)

And remove the strange exception for shafts in the calling of handle_traps() as brought up in Bug 1916327 (now discussion about levitation + traps).

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

Created by j-p-e-g on March 24, 2008

XI7U6RL6MFTH6SZQMLO4XFWGXGIFJBCRT6ZFCJFR2B2MGRSKDDCAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.cc at line 324 [5.962854]

[3.342682]

[4.731]

            // mechanical traps and shafts cannot be set off if the
	    // player is flying or levitating

Replacement in crawl-ref/source/player.cc at line 327 [5.962854]

∅:D[4.769] → [3.342722:342801]

B:BD[3.342722] → [3.342722:342801]

                || trap_category( env.trap[id].type ) != DNGN_TRAP_MECHANICAL)

[4.769]

[3.342801]

                || trap_category( env.trap[id].type ) == DNGN_TRAP_MAGICAL)

Deletion in crawl-ref/source/libgui.cc at line 359 [7.5793336]

B:BD[6.2743] → [2.3347:3399]

∅:D[2.3399] → [8.4188:4194]

B:BD[9.4197] → [8.4188:4194]

B:BD[8.4194] → [2.3400:3730]

∅:D[2.3730] → [8.4195:4201]

∅:D[10.4181] → [8.4195:4201]

B:BD[9.4272] → [8.4195:4201]

    else if (mgrd[x][y] != NON_MONSTER && upd_tile)
    {
        if (mons_friendly(&menv[mgrd[x][y]]))
            c = Options.tile_friendly_col; // colour friendly monsters
        else if (mons_neutral(&menv[mgrd[x][y]])
                 && Options.tile_neutral_col != Options.tile_monster_col)
        {
            c = Options.tile_neutral_col;  // colour neutral monsters
        }
    }

Replacement in crawl-ref/source/libgui.cc at line 379 [7.5793336]

B:BD[9.4842] → [11.3244:3245]

[9.4842]

[10.4301]

        if (c == Options.tile_monster_col && mgrd[x][y] != NON_MONSTER
            && upd_tile)
        {
            if (mons_friendly(&menv[mgrd[x][y]]))
                c = Options.tile_friendly_col; // colour friendly monsters
            else if (mons_neutral(&menv[mgrd[x][y]])
                     && Options.tile_neutral_col != Options.tile_monster_col)
            {
                c = Options.tile_neutral_col;  // colour neutral monsters
            }
        }