fiddlerwoaroof/crawl - Change LOEVXFCKSHE3TCQSUSHOIHHVDJT3RFLE6U3VDI6JXAQTQI5KCJ4AC

Make good neutral an actual monster attitude, as it's cleaner that way.

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

Created by dolorous on April 12, 2008

LOEVXFCKSHE3TCQSUSHOIHHVDJT3RFLE6U3VDI6JXAQTQI5KCJ4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 3829 [5.804403]
B:BD[4.8391] → [4.8391:8426]
```
    holy->attitude  = ATT_NEUTRAL;
```
[4.8391]
[6.2712]
```
    holy->attitude  = ATT_GOOD_NEUTRAL;
```
Deletion in crawl-ref/source/religion.cc at line 3834 [5.804403]
B:BD[7.3196] → [8.2678:2711]
```
    holy->flags |= MF_GOD_GIFT;
```

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

B:BD[5.1496065] → [5.1496065:1496138]

                    // all direct-effect/summoning/self-enchantments/etc

[5.1496065]

[5.1496138]

                    // all direct-effect/summoning/self-enchantments/etc.

Replacement in crawl-ref/source/monstuff.cc at line 4208 [5.1396662]
B:BD[5.1496174] → [9.13256:13277]
```
                    
```
[5.1496174]
[9.13277]
Replacement in crawl-ref/source/monstuff.cc at line 5233 [5.1396662]
B:BD[10.440858] → [10.440858:440906]
```
    if (ipushee < 0 || ipushee >= MAX_MONSTERS)
```
[10.440858]
[10.440906]
```
    if (invalid_monster_index(ipushee))
```
Replacement in crawl-ref/source/monstuff.cc at line 5334 [5.1396662]
B:BD[11.3124] → [11.3124:3129]
```
    
```
[11.3124]
[11.3129]
Replacement in crawl-ref/source/monstuff.cc at line 5355 [5.1396662]
B:BD[11.3474] → [11.3474:3479]
```
    
```
[11.3474]
[11.3552]
Replacement in crawl-ref/source/monstuff.cc at line 5358 [5.1396662]
B:BD[11.3594] → [11.3594:3599]
```
    
```
[11.3594]
[11.3840]
Replacement in crawl-ref/source/monstuff.cc at line 5502 [5.1396662]
∅:D[12.2483] → [13.778:783]
B:BD[13.778] → [13.778:783]
```
    
```
[12.2483]
[14.1878]
Replacement in crawl-ref/source/monstuff.cc at line 5506 [5.1396662]
B:BD[14.1987] → [12.2511:2520]
```
        
```
[14.1987]
[12.2520]
Replacement in crawl-ref/source/monstuff.cc at line 5543 [5.1396662]
B:BD[13.1143] → [13.1143:1156]
```
            
```
[13.1143]
[13.1156]
Replacement in crawl-ref/source/monstuff.cc at line 5561 [5.1396662]
B:BD[13.2200] → [13.2200:2213]
```
            
```
[13.2200]
[15.9757]

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

B:BD[3.2671] → [3.2671:2721]

    // attacking monsters won't enter sanctuaries

[3.2671]

[3.2721]

    // non-friendly and non-good neutral monsters won't enter
    // sanctuaries

Replacement in crawl-ref/source/monstuff.cc at line 6186 [5.1396662]
B:BD[16.764] → [16.764:781]
```
                
```
[16.764]
[5.1545447]

Insertion in crawl-ref/source/mon-util.cc at line 1761 [5.1699344]

[5.1733581]

    if (fr1 == ATT_GOOD_NEUTRAL)
        fr1 = ATT_FRIENDLY;
    if (fr2 == ATT_GOOD_NEUTRAL)
        fr2 = ATT_FRIENDLY;

Replacement in crawl-ref/source/mon-util.cc at line 1822 [5.1699344]

B:BD[17.2695] → [2.2562:2638]

    return (m->attitude == ATT_NEUTRAL && testbits(m->flags, MF_GOD_GIFT));

[17.2695]

[5.1733724]

    return (m->attitude == ATT_GOOD_NEUTRAL);

Replacement in crawl-ref/source/mon-util.cc at line 2340 [5.1699344]

B:BD[10.484996] → [10.484996:485074]

 * (Smiters would be eligible for shoving when fleeing if the AI allowed for

[10.484996]

[10.485074]

 * (Smiters would be eligible for shoving when fleeing if the AI allowed for

Replacement in crawl-ref/source/mon-util.cc at line 2359 [5.1699344]
B:BD[10.485657] → [10.485657:485662]
```
    
```
[10.485657]
[10.485662]
Replacement in crawl-ref/source/mon-util.cc at line 2377 [5.1699344]
∅:D[18.1995] → [10.486508:486513]
B:BD[10.486508] → [10.486508:486513]
```
    
```
[18.1995]
[10.486513]

Replacement in crawl-ref/source/mon-util.cc at line 2397 [5.1699344]

B:BD[10.487202] → [10.487202:487283]

    if (m1->type == MONS_QUEEN_BEE 
            && (m2->type == MONS_KILLER_BEE

[10.487202]

[10.487283]

    if (m1->type == MONS_QUEEN_BEE
            && (m2->type == MONS_KILLER_BEE

Replacement in crawl-ref/source/enum.h at line 1861 [5.3287960]

B:BD[5.3340975] → [5.3340975:3340991]

    ATT_NEUTRAL

[5.3340975]

[5.3340991]

    ATT_NEUTRAL,                       // neutral
    ATT_GOOD_NEUTRAL                   // like friendly, but can't be ordered

Make good neutral an actual monster attitude, as it's cleaner that way.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 3829 [5.804403]

Deletion in crawl-ref/source/religion.cc at line 3834 [5.804403]

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/mon-util.cc at line 1761 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1822 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2340 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2359 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2377 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2397 [5.1699344]

Replacement in crawl-ref/source/enum.h at line 1861 [5.3287960]