fiddlerwoaroof/crawl - Change CSG3JFGXP6JM24SVDIYGJWSTY3UEHHX7EM5D5QOL2YYGX7FEOFUAC

Don't apply god conducts in monster_die() while in arena mode. In partiuclar,

this prevents TSO from smiting the player when the friendly faction kills an angel or daeva.

Assert in god_speaks() and did_god_conduct() if called during arena mode.

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

Created by zelgadis on January 2, 2009

CSG3JFGXP6JM24SVDIYGJWSTY3UEHHX7EM5D5QOL2YYGX7FEOFUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 2310 [3.804403]
[3.822791]
[2.2491]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/religion.cc at line 2353 [3.804403]
[3.836720]
[4.2431]
```
    ASSERT(!crawl_state.arena);
```

Insertion in crawl-ref/source/monstuff.cc at line 1176 [3.1396662]

[5.2886]

[6.77149]


            if (crawl_state.arena)
                break;

Insertion in crawl-ref/source/monstuff.cc at line 1331 [3.1396662]

[7.4665]

[3.1412996]


            if (crawl_state.arena)
                break;

Replacement in crawl-ref/source/monstuff.cc at line 1571 [3.1396662]
B:BD[8.3810] → [9.3083:3104]
```
    if (!mons_reset)
```
[8.3810]
[3.1417837]
```
    if (!mons_reset && !crawl_state.arena)
```