fiddlerwoaroof/crawl - Change JLEDZAG6ACM3AR2MRISKAR3KLKSXGTPRCSDXFXIF6XYI7T45GX7AC

Make banished pacified monsters silently leave the level, and remove an

unused parameter from _monster_die_cloud().

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

Created by dolorous on June 7, 2009

JLEDZAG6ACM3AR2MRISKAR3KLKSXGTPRCSDXFXIF6XYI7T45GX7AC

Dependencies

In channels

main

Change contents

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

B:BD[4.9515] → [4.9515:9571]

                        bool summoned, int summon_type)

[4.9515]

[4.9571]

                        bool summoned)

Replacement in crawl-ref/source/monstuff.cc at line 1134 [5.1396662]
∅:D[6.2849] → [5.1405840:1405895]
∅:D[7.2992] → [5.1405840:1405895]
B:BD[5.1405840] → [5.1405840:1405895]
```
    // From time to time Trog gives you a little bonus
```
[7.2992]
[8.9894]
```
    // From time to time Trog gives you a little bonus.
```

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

B:BD[5.1412740] → [9.2568:2695]

        case KILL_MON:          // Monster kills in combat
        case KILL_MON_MISSILE:  // Monster kills by missile or beam

[5.1412740]

[10.1186]

        case KILL_MON:          // Monster kills in combat.
        case KILL_MON_MISSILE:  // Monster kills by missile or beam.

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

B:BD[5.1413295] → [11.2542:2617]

            // prevent summoned creatures from being done_good kills. Only

[5.1413295]

[11.2617]

            // prevent summoned creatures from being done_good kills.  Only

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

B:BD[5.1415079] → [12.2852:2928]

            // Monster doesn't die, just goes back to wherever it came from

[5.1415079]

[12.2928]

            // Monster doesn't die, just goes back to wherever it came from.

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

B:BD[12.3004] → [12.3004:3082]

            // abjuration), because it uses the beam variables! Or does it???

[12.3004]

[13.417008]

            // abjuration), because it uses the beam variables!  Or does it???
            // Pacified monsters leave the level when this happens.

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

B:BD[14.1170] → [14.1170:1213]

            if (!monster->needs_transit())

[14.1170]

[2.204]

            if (mons_is_pacified(monster) || !monster->needs_transit())

Replacement in crawl-ref/source/monstuff.cc at line 1646 [5.1396662]
B:BD[5.1415888] → [15.2631:2675]
```
    // Make sure Boris has a foe to address
```
[5.1415888]
[15.2675]
```
    // Make sure Boris has a foe to address.
```

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

B:BD[16.2942] → [3.2637:2718]

        _monster_die_cloud(monster, !mons_reset, silent, summoned, summon_type);

[16.2942]

[17.2708]

        _monster_die_cloud(monster, !mons_reset, silent, summoned);