fiddlerwoaroof/crawl - Change ZR4ALQ5F2ETOD3GXMBYXSN6P75DPDGI3C275A7W5XHYI5TGPHNUQC

Fix 2085598: Nemelex won't be disappointed if there are invisible monsters

nearby when drawing from Destruction, even if you can't see them. Xom can now act on creatures you can't see.

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

Created by haranp on September 21, 2008

ZR4ALQ5F2ETOD3GXMBYXSN6P75DPDGI3C275A7W5XHYI5TGPHNUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 592 [7.3]

B:BD[7.15797] → [8.4:45]

        if (there_are_monsters_nearby())

[7.15797]

[8.45]

        if (there_are_monsters_nearby(false, false))

Replacement in crawl-ref/source/xom.cc at line 599 [7.3]

B:BD[8.195] → [5.1234:1322]

                god_speaks(GOD_XOM, _get_xom_speech("good monster polymorph").c_str());

[8.195]

[9.320]

                god_speaks(GOD_XOM,
                           _get_xom_speech("good monster polymorph").c_str());

Replacement in crawl-ref/source/xom.cc at line 800 [7.3]

B:BD[7.23217] → [8.777:822]

            if (there_are_monsters_nearby())

[7.23217]

[8.822]

            if (there_are_monsters_nearby(false, false))

Replacement in crawl-ref/source/output.cc at line 1444 [10.1088282]

B:BD[4.4459] → [4.4459:4536]

    std::vector<monsters*> visible;
    get_playervisible_monsters(visible);

[4.4459]

[4.4536]

    std::vector<monsters*> visible = get_nearby_monsters();

Replacement in crawl-ref/source/misc.h at line 75 [10.1928926]

B:BD[11.8827] → [12.2806:2868]

B:BD[12.2868] → [13.3377:3536]

void get_playervisible_monsters(std::vector<monsters*>& mons,
                                bool want_move = false, bool just_check = false,
                                bool dangerous_only = false, int range = -1);

[11.8827]

[12.3022]

std::vector<monsters*> get_nearby_monsters(bool want_move = false,
                                           bool just_check = false,
                                           bool dangerous_only = false,
                                           bool require_visible = true,
                                           int range = -1);

Replacement in crawl-ref/source/misc.h at line 84 [10.1928926]

B:BD[3.2581] → [3.2581:2615]

bool there_are_monsters_nearby();

[3.2581]

[14.460]

bool there_are_monsters_nearby(bool dangerous_only = false,
                               bool require_visible = true);

Replacement in crawl-ref/source/misc.cc at line 2323 [10.1933596]

B:BD[15.6179] → [16.13056:13134]

∅:D[16.13134] → [11.8955:8992]

B:BD[11.8955] → [11.8955:8992]

// Return all monsters in range (default: LOS) that the player is able to see
// and recognize as being a monster.

[15.6179]

[17.6318]

// Return all nearby monsters in range (default: LOS) that the player
// is able to recognize as being monsters (i.e. no unknown mimics or
// submerged creatures.)

Insertion in crawl-ref/source/misc.cc at line 2330 [10.1933596]
[16.13322]
[16.13322]
```
// require_visible Require that monsters be visible to the player
```

Replacement in crawl-ref/source/misc.cc at line 2333 [10.1933596]

∅:D[17.6325] → [16.13375:13630]

B:BD[16.13375] → [16.13375:13630]

void get_playervisible_monsters(std::vector<monsters*> &mons,
                                bool want_move,
                                bool just_check,
                                bool dangerous_only,
                                int range)

[17.6325]

[15.6303]

std::vector<monsters*> get_nearby_monsters(bool want_move,
                                           bool just_check,
                                           bool dangerous_only,
                                           bool require_visible,
                                           int range)

Insertion in crawl-ref/source/misc.cc at line 2341 [10.1933596]
[12.3609]
[12.3609]
```
    std::vector<monsters*> mons;
```

Replacement in crawl-ref/source/misc.cc at line 2352 [10.1933596]

B:BD[15.6802] → [18.2818:2873]

                monsters *mon = &env.mons[targ_monst];

[15.6802]

[6.2689]

                monsters *mon = &menv[targ_monst];

Replacement in crawl-ref/source/misc.cc at line 2354 [10.1933596]

B:BD[6.2722] → [6.2722:2773]

                    && player_monster_visible(mon)

[6.2722]

[18.2921]

                    && (!require_visible || player_monster_visible(mon))

Replacement in crawl-ref/source/misc.cc at line 2361 [10.1933596]

B:BD[18.3226] → [18.3226:3258]

                        return;

[18.3226]

[15.7065]

                        return mons;

Insertion in crawl-ref/source/misc.cc at line 2366 [10.1933596]
[13.3676]
[15.7113]
```
    return mons;
```

Replacement in crawl-ref/source/misc.cc at line 2396 [10.1933596]

∅:D[19.8770] → [12.5407:5443]

B:BD[12.5407] → [12.5407:5443]

B:BD[12.5443] → [20.2629:2705]

    std::vector<monsters*> visible;
    get_playervisible_monsters(visible, want_move, !announce, true, range);

[19.8770]

[12.5519]

    std::vector<monsters*> visible =
        get_nearby_monsters(want_move, !announce, true, true, range);

Replacement in crawl-ref/source/misc.cc at line 2425 [10.1933596]
B:BD[21.548888] → [2.2580:2613]
```
bool there_are_monsters_nearby()
```
[21.548888]
[2.2613]
```
bool there_are_monsters_nearby(bool dangerous_only, bool require_visible)
```

Replacement in crawl-ref/source/misc.cc at line 2427 [10.1933596]

B:BD[2.2615] → [2.2615:2759]

    // Monster check.
    std::vector<monsters*> visible;
    get_playervisible_monsters(visible, false, true);
    return (!visible.empty());

[2.2615]

[2.2759]

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

Replacement in crawl-ref/source/decks.cc at line 1618 [10.3987460]
B:BD[22.20099] → [23.1324:1367]
```
    bool rc = there_are_monsters_nearby();
```
[22.20099]
[24.525]
```
    bool rc = there_are_monsters_nearby(true, false);
```