fiddlerwoaroof/crawl - Change F7QFSXE22UPQTBLYJLY26HJ3QPHFNBJMUOFJRV35R5YCHSGKTBYQC

Improve the previous sanity fixes. Add a function

invalid_monster_index(), and use that where applicable. Also, put the "god gift" flag back on orcish followers, since the Crusade card now handles orc conversion properly for Beoghites, and so that the index check doesn't have to be done twice for collateral kills.

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

Created by dolorous on March 20, 2008

F7QFSXE22UPQTBLYJLY26HJ3QPHFNBJMUOFJRV35R5YCHSGKTBYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3429 [6.804403]
B:BD[4.5111] → [4.5111:5124]
```
            
```
[4.5111]
[4.5124]
Insertion in crawl-ref/source/religion.cc at line 3440 [6.804403]
[7.3046]
[7.3077]
```
    orc->flags |= MF_GOD_GIFT;
```
Replacement in crawl-ref/source/monstuff.cc at line 469 [6.1396662]
B:BD[8.5051] → [8.5051:5056]
```
    
```
[8.5051]
[8.5056]

Replacement in crawl-ref/source/monstuff.cc at line 480 [6.1396662]

B:BD[5.2543] → [5.2543:2645]

    if (MON_KILL(killer)
        && i != ANON_FRIENDLY_MONSTER
        && i >= 0 && i < MAX_MONSTERS)

[5.2543]

[8.5309]

    if (MON_KILL(killer) && !invalid_monster_index(i))

Replacement in crawl-ref/source/monstuff.cc at line 531 [6.1396662]
B:BD[8.6471] → [8.6471:6480]
```
        
```
[8.6471]
[9.2542]

Replacement in crawl-ref/source/monstuff.cc at line 541 [6.1396662]

B:BD[9.2770] → [5.2648:2767]

        else if (MON_KILL(killer)
            && i != ANON_FRIENDLY_MONSTER
            && i >= 0 && i < MAX_MONSTERS)

[9.2770]

[9.2805]

        else if (MON_KILL(killer) && !invalid_monster_index(i))

Replacement in crawl-ref/source/monstuff.cc at line 727 [6.1396662]
B:BD[10.243842] → [11.2994:3037]
```
            const bool created_friendly = 
```
[10.243842]
[11.3037]
```
            const bool created_friendly =
```
Replacement in crawl-ref/source/monstuff.cc at line 867 [6.1396662]
B:BD[12.414226] → [12.414226:414261]
```
                        notice |= 
```
[12.414226]
[12.414261]
```
                        notice |=
```

Deletion in crawl-ref/source/monstuff.cc at line 873 [6.1396662]

B:BD[13.129] → [14.2686:2741]

B:BD[14.2741] → [3.2542:2604]

                         || (you.religion == GOD_BEOGH
                             && is_orcish_follower(&menv[i]))

Replacement in crawl-ref/source/monstuff.cc at line 935 [6.1396662]

∅:D[2.4160] → [11.3504:3605]

B:BD[11.3504] → [11.3504:3605]

                    && i != ANON_FRIENDLY_MONSTER
                    && i >= 0 && i < MAX_MONSTERS)

[2.4160]

[15.5066]

                    && !invalid_monster_index(i))

Insertion in crawl-ref/source/mon-util.h at line 661 [6.1682293]
[12.465215]
[12.465215]
```
bool invalid_monster_index(int i);
```

Insertion in crawl-ref/source/mon-util.cc at line 472 [6.1699344]

[12.470465]

bool invalid_monster_index(int i)
{
    return (i != ANON_FRIENDLY_MONSTER
            && i >= 0
            && i < MAX_MONSTERS);
}

Improve the previous sanity fixes. Add a function

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 3429 [6.804403]

Insertion in crawl-ref/source/religion.cc at line 3440 [6.804403]

Replacement in crawl-ref/source/monstuff.cc at line 469 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 480 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 531 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 541 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 727 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 867 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 873 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 935 [6.1396662]

Insertion in crawl-ref/source/mon-util.h at line 661 [6.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 472 [6.1699344]