fiddlerwoaroof/crawl - Change IT3NSSLR756K7TZ7S7DOMS7DZUVGIFS5EAR22PEERAF5ZRBICV4AC

Add more holiness cleanups.

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

Created by dolorous on March 15, 2008

IT3NSSLR756K7TZ7S7DOMS7DZUVGIFS5EAR22PEERAF5ZRBICV4AC

Dependencies

In channels

main

Change contents

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

B:BD[5.6002] → [4.2784:2892]

            if (mons_class_holiness(monster->type) == MH_HOLY &&
                is_good_god(you.religion))

[5.6002]

[5.6162]

            if (mons_is_holy(monster) && is_good_god(you.religion))

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

B:BD[4.3246] → [4.3246:3364]

            else if ((mons_class_holiness(monster->type) == MH_HOLY &&
                !is_good_god(you.religion)) ||

[4.3246]

[4.3364]

            else if ((mons_is_holy(monster) &&
                        !is_good_god(you.religion)) ||

Replacement in crawl-ref/source/religion.cc at line 3312 [6.804403]
B:BD[5.8098] → [5.8098:8154]
```
    ASSERT(mons_class_holiness(holy->type) == MH_HOLY);
```
[5.8098]
[5.8154]
```
    ASSERT(mons_is_holy(holy));
```

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

B:BD[7.413569] → [7.413569:413624]

                if (mons_holiness(monster) == MH_HOLY)

[7.413569]

[8.4366]

                if (mons_is_holy(monster))

Insertion in crawl-ref/source/mon-util.h at line 633 [6.1682293]
[9.2473]
[7.464559]
```
bool mons_is_holy( const monsters *mon );
```
Replacement in crawl-ref/source/mon-util.h at line 636 [6.1682293]
B:BD[7.464645] → [3.4185:4238]
```
bool mons_is_evil_or_unholy( const monsters *mons );
```
[7.464645]
[10.264]
```
bool mons_is_evil_or_unholy( const monsters *mon );
```

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

[7.473056]

bool mons_is_holy( const monsters *mon )
{
    return (mons_holiness( mon ) == MH_HOLY);
}

Replacement in crawl-ref/source/mon-util.cc at line 1034 [6.1699344]
B:BD[7.473252] → [3.4655:4707]
```
bool mons_is_evil_or_unholy( const monsters *mons )
```
[7.473252]
[3.4707]
```
bool mons_is_evil_or_unholy( const monsters *mon )
```

Replacement in crawl-ref/source/mon-util.cc at line 1036 [6.1699344]

B:BD[3.4709] → [3.4709:4766]

    return (mons_is_evil(mons) || mons_is_unholy(mons));

[3.4709]

[7.473306]

    return (mons_is_evil(mon) || mons_is_unholy(mon));

Replacement in crawl-ref/source/fight.cc at line 958 [6.3140790]
B:BD[11.820] → [11.820:825]
```
    
```
[11.820]
[12.41652]
Replacement in crawl-ref/source/fight.cc at line 968 [6.3140790]
B:BD[12.41937] → [12.41937:41959]
```
                     
```
[12.41937]
[12.41959]
Replacement in crawl-ref/source/fight.cc at line 971 [6.3140790]
∅:D[13.30072] → [12.42055:42076]
B:BD[12.42055] → [12.42055:42076]
```
                    
```
[13.30072]
[12.42076]
Replacement in crawl-ref/source/fight.cc at line 986 [6.3140790]
B:BD[14.1900] → [14.1900:1923]
```
                      
```
[14.1900]
[14.1923]
Replacement in crawl-ref/source/delay.cc at line 89 [6.3963459]
B:BD[15.3322] → [15.3322:3368]
```
    const int holiness = mons_holiness(mons);
```
[15.3322]
[15.3368]
```
    const mon_holy_type holiness = mons_holiness(mons);
```
Replacement in crawl-ref/source/delay.cc at line 99 [6.3963459]
B:BD[15.3572] → [15.3572:3581]
```
        
```
[15.3572]
[2.2642]
Replacement in crawl-ref/source/beam.cc at line 3777 [6.4128068]
B:BD[16.6578] → [17.6124:6145]
∅:D[17.6145] → [7.1248012:1248065]
B:BD[7.1248012] → [7.1248012:1248065]
```
                    
                if (mons_holiness( mon ) == MH_HOLY)
```
[16.6578]
[16.6579]
```
                if (mons_is_holy( mon ))
```
Replacement in crawl-ref/source/beam.cc at line 3943 [6.4128068]
B:BD[18.18430] → [18.18430:18443]
```
            
```
[18.18430]
[7.1249487]
Replacement in crawl-ref/source/beam.cc at line 3947 [6.4128068]
B:BD[7.1249581] → [7.1249581:1249630]
```
            if (mons_holiness( mon ) == MH_HOLY)
```
[7.1249581]
[8.4951]
```
            if (mons_is_holy(mon))
```

Add more holiness cleanups.

Dependencies

In channels

Change contents

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

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

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

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

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

Replacement in crawl-ref/source/mon-util.h at line 636 [6.1682293]

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

Replacement in crawl-ref/source/mon-util.cc at line 1034 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1036 [6.1699344]

Replacement in crawl-ref/source/fight.cc at line 958 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 968 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 971 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 986 [6.3140790]

Replacement in crawl-ref/source/delay.cc at line 89 [6.3963459]

Replacement in crawl-ref/source/delay.cc at line 99 [6.3963459]

Replacement in crawl-ref/source/beam.cc at line 3777 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 3943 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 3947 [6.4128068]