fiddlerwoaroof/crawl - Change L5H6B2WM4OOVGVCZOT3Z7DC2MOUVDLZ4DWRA6L6J3EUXF55USTZQC

Simplify _mon_on_interesting_grid() by reusing _is_native_in_branch()

where possible.

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

Created by dolorous on May 28, 2008

L5H6B2WM4OOVGVCZOT3Z7DC2MOUVDLZ4DWRA6L6J3EUXF55USTZQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 85 [5.1396662]

[4.3114]

[5.1398387]

static bool _is_native_in_branch(const monsters *monster,
                                 const branch_type branch);

Replacement in crawl-ref/source/monstuff.cc at line 2834 [5.1396662]
B:BD[3.4391] → [3.4391:4439]
```
        return (mons_holiness(mon) == MH_HOLY);
```
[3.4391]
[3.4439]
```
        return (mons_is_holy(mon));
```

Replacement in crawl-ref/source/monstuff.cc at line 2841 [5.1396662]

B:BD[3.4657] → [3.4657:4711]

        return (mons_species(mon->type) == MONS_ORC);

[3.4657]

[3.4711]

        return (_is_native_in_branch(mon, BRANCH_ORCISH_MINES));

Replacement in crawl-ref/source/monstuff.cc at line 2846 [5.1396662]

B:BD[3.4827] → [3.4827:4881]

        return (mons_species(mon->type) == MONS_ELF);

[3.4827]

[3.4881]

        return (_is_native_in_branch(mon, BRANCH_ELVEN_HALLS));

Replacement in crawl-ref/source/monstuff.cc at line 2850 [5.1396662]

B:BD[3.4956] → [3.4956:5085]

        return (mons_species(mon->type == MONS_KILLER_BEE)
                || mons_species(mon->type == MONS_KILLER_BEE_LARVA));

[3.4956]

[3.5085]

        return (_is_native_in_branch(mon, BRANCH_HIVE));

Replacement in crawl-ref/source/monstuff.cc at line 5746 [5.1396662]

B:BD[6.205] → [2.6096:6257]

// Returns true for monsters that obviously (to the player)
// feel "thematically at home" in a branch.
// Currently used for native monsters recognizing traps.

[6.205]

[4.9231]

// Returns true for monsters that obviously (to the player) feel
// "thematically at home" in a branch.  Currently used for native
// monsters recognizing traps and patrolling branch entrances.