fiddlerwoaroof/crawl - Change UEZHRKVE25KVD6RRO7IFTTDSPKPM74LSC5I7J6O7ASSKDBQZXEGAC

Differentiate intrinsically safe monsters and ones which the user options

consider safe. Fixes 2430467.

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

Created by haranp on December 15, 2008

UEZHRKVE25KVD6RRO7IFTTDSPKPM74LSC5I7J6O7ASSKDBQZXEGAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/misc.h at line 72 [6.1928926]

B:BD[4.541057] → [5.4913:4977]

bool mons_is_safe(const monsters *mon, bool want_move = false);

[4.541057]

[7.2935]

bool mons_is_safe(const monsters *mon, bool want_move = false,
                  bool consider_user_options = true);

Insertion in crawl-ref/source/misc.h at line 80 [6.1928926]

[8.2957]

                                           bool consider_user_options = true,

Replacement in crawl-ref/source/misc.h at line 88 [6.1928926]

B:BD[8.3150] → [8.3150:3211]

                               bool require_visible = true);

[8.3150]

[9.460]

                               bool require_visible = true,
                               bool consider_user_options = false);

Replacement in crawl-ref/source/misc.cc at line 2554 [6.1933596]

B:BD[10.20387] → [3.3516:3571]

bool mons_is_safe(const monsters *mon, bool want_move)

[10.20387]

[11.1690]

bool mons_is_safe(const monsters *mon, bool want_move,
                  bool consider_user_options)

Replacement in crawl-ref/source/misc.cc at line 2571 [6.1933596]

B:BD[11.1844] → [12.17712:17756]

    bool moving = (!you.delay_queue.empty()

[11.1844]

[13.3196]

    if (consider_user_options)
    {
        bool moving = (!you.delay_queue.empty()

Replacement in crawl-ref/source/misc.cc at line 2576 [6.1933596]

B:BD[12.17826] → [12.17826:17914]

∅:D[13.3404] → [11.2089:2090]

∅:D[12.17914] → [11.2089:2090]

B:BD[11.2089] → [11.2089:2090]

B:BD[11.2193] → [11.2193:2347]

B:BD[11.2347] → [14.2658:2664]

∅:D[14.2664] → [11.2347:2373]

B:BD[11.2347] → [11.2347:2373]

                   || you.running < RMODE_NOT_RUNNING
                   || want_move);
    bool result = is_safe;
    if (clua.callfn("ch_mon_is_safe", "Mbbd>b",
                    mon, is_safe, moving, dist,
                    &result))
    {
        is_safe = result;

[12.17826]

[14.2665]

                       || you.running < RMODE_NOT_RUNNING
                       || want_move);
        
        bool result = is_safe;
    
        if (clua.callfn("ch_mon_is_safe", "Mbbd>b",
                        mon, is_safe, moving, dist,
                        &result))
        {
            is_safe = result;
        }

Insertion in crawl-ref/source/misc.cc at line 2646 [6.1933596]

[8.3628]

                                           bool consider_user_options,

Replacement in crawl-ref/source/misc.cc at line 2666 [6.1933596]

B:BD[2.3466] → [2.3466:3537]

                && (!dangerous_only || !mons_is_safe(mon, want_move)))

[2.3466]

[15.6788]

                && (!dangerous_only || !mons_is_safe(mon, want_move,
                                                     consider_user_options)))

Replacement in crawl-ref/source/misc.cc at line 2706 [6.1933596]

B:BD[8.4002] → [8.4002:4072]

        get_nearby_monsters(want_move, !announce, true, true, range);

[8.4002]

[13.5519]

        get_nearby_monsters(want_move, !announce, true, true, true, range);

Replacement in crawl-ref/source/misc.cc at line 2734 [6.1933596]

B:BD[4.548888] → [8.4073:4147]

bool there_are_monsters_nearby(bool dangerous_only, bool require_visible)

[4.548888]

[16.2613]

bool there_are_monsters_nearby(bool dangerous_only, bool require_visible,
                               bool consider_user_options)

Replacement in crawl-ref/source/misc.cc at line 2737 [6.1933596]

B:BD[16.2615] → [8.4148:4270]

    return (!get_nearby_monsters(false, true,
                                 dangerous_only, require_visible).empty());

[16.2615]

[16.2759]

    return (!get_nearby_monsters(false, true, dangerous_only,
                                 consider_user_options,
                                 require_visible).empty());