fiddlerwoaroof/crawl - Change Y5YQ2AXS6XTWCHEQFDXRYU2IDQTBW7WXNJFES22GSKYQ2JGZ3U5AC

Make sanctuary prevent giant eyeball and eye of draining stares, plus

moth of wrath goading/inciting.

In monstuff.cc put "either monster or player in sanctuary" checks into convenience function.

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

Created by zelgadis on June 28, 2008

Y5YQ2AXS6XTWCHEQFDXRYU2IDQTBW7WXNJFES22GSKYQ2JGZ3U5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 2523 [4.1340842]

[3.2519]

    if (is_sanctuary(you.x_pos, you.y_pos)
        || is_sanctuary(mon->x, mon->y))
    {
        return 0;
    }

Insertion in crawl-ref/source/mstuff2.cc at line 2537 [4.1340842]

[3.2770]

            continue;
        if (is_sanctuary(targ->x, targ->y))

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

[5.6531]

[4.1467214]

static bool _is_player_or_mon_sanct(const monsters* monster)
{
    return (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y));
}

Replacement in crawl-ref/source/monstuff.cc at line 3936 [4.1396662]

B:BD[2.4677] → [2.4677:4719]

            && !mons_is_leaving(monster))

[2.4677]

[4.1468183]

            && !mons_is_leaving(monster)
            && !_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 3951 [4.1396662]

B:BD[2.4761] → [2.4761:4803]

            && !mons_is_leaving(monster))

[2.4761]

[4.1468499]

            && !mons_is_leaving(monster)
            && !_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4012 [4.1396662]

B:BD[6.422766] → [7.11834:11934]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))

[6.422766]

[7.11934]

        if (_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4020 [4.1396662]

B:BD[6.422858] → [7.11974:12074]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))

[6.422858]

[7.12074]

        if (_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 4151 [4.1396662]

B:BD[7.12509] → [7.12509:12619]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

[7.12509]

[4.1474654]

        if (_is_player_or_mon_sanct(monster))

Deletion in crawl-ref/source/monstuff.cc at line 4153 [4.1396662]
B:BD[4.1474673] → [7.12620:12630]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 4191 [4.1396662]

B:BD[7.12651] → [7.12651:12761]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

[7.12651]

[4.1475014]

        if (_is_player_or_mon_sanct(monster))

Deletion in crawl-ref/source/monstuff.cc at line 4193 [4.1396662]
B:BD[4.1475033] → [7.12762:12772]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 5334 [4.1396662]

B:BD[7.13075] → [7.13075:13201]

                else if (is_sanctuary(you.x_pos, you.y_pos)
                         || is_sanctuary(monster->x, monster->y))

[7.13075]

[7.13201]

                else if (_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5363 [4.1396662]

∅:D[8.2675] → [7.13277:13423]

B:BD[7.13277] → [7.13277:13423]

                    if (is_sanctuary(you.x_pos, you.y_pos)
                        || is_sanctuary(monster->x, monster->y))
                    {

[8.2675]

[7.13423]

                    if (_is_player_or_mon_sanct(monster))

Deletion in crawl-ref/source/monstuff.cc at line 5365 [4.1396662]
B:BD[7.13464] → [7.13464:13486]
```
                    }
```

Replacement in crawl-ref/source/monstuff.cc at line 5408 [4.1396662]

B:BD[7.13646] → [7.13646:13792]

                    if (is_sanctuary(you.x_pos, you.y_pos)
                        || is_sanctuary(monster->x, monster->y))
                    {

[7.13646]

[7.13792]

                    if (_is_player_or_mon_sanct(monster))

Deletion in crawl-ref/source/monstuff.cc at line 5410 [4.1396662]
B:BD[7.13845] → [7.13845:13867]
```
                    }
```

Replacement in crawl-ref/source/monstuff.cc at line 5428 [4.1396662]

∅:D[5.8218] → [7.14042:14147]

B:BD[7.14042] → [7.14042:14147]

            && !is_sanctuary(you.x_pos, you.y_pos)
            && !is_sanctuary(monster->x, monster->y))

[5.8218]

[6.427097]

            && !_is_player_or_mon_sanct(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5602 [4.1396662]

B:BD[7.14173] → [7.14173:14279]

    if (is_sanctuary(monster->x, monster->y)
        || is_sanctuary(beem.target_x, beem.target_y))
    {

[7.14173]

[9.606]

    if (_is_player_or_mon_sanct(monster))

Deletion in crawl-ref/source/monstuff.cc at line 5604 [4.1396662]
B:BD[9.630] → [7.14280:14286]
```
    }
```