fiddlerwoaroof/crawl - Change IAQLRRSOXHIU4XQNOFK5F6IUXCMMXSHDDETNYWFPV7YNWPIRIUOQC

Allow "sort_menus:any" to override the default "pickup:" statement.

Apply patch submitted for BR 1945384: friendlies will try to move around the player to get to their target instead of trying to move through the player and ending up doing nothing.

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

Created by j-p-e-g on April 18, 2008

IAQLRRSOXHIU4XQNOFK5F6IUXCMMXSHDDETNYWFPV7YNWPIRIUOQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 5823 [4.1396662]

[3.6853]

    // friendlies shouldn't try to move onto the player's
    // location, if they are aiming for some other target
    if (mons_wont_attack(monster)
        && monster->foe != MHITNOT
        && monster->foe != MHITYOU
        && targ_x == you.x_pos
        && targ_y == you.y_pos)
    {
        return false;
    }

Insertion in crawl-ref/source/initfile.cc at line 1536 [4.2957258]

[5.11688]

[2.2906]


    // Overrides all previous settings.
    if (cond.mtype == MT_ANY)
        sort_menus.clear();