fiddlerwoaroof/crawl - Change CYGE2HFCVSLUJOK7AJ6MILAHS3374R7MQEAZTALS2A6GQZUYY6SAC

Fix bug #2502460: delays causing asserts (oops).

Xom gift monsters are placed immediately, so it's possible for them to get damaged by the ongoing actions of the player.

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

Created by zelgadis on January 12, 2009

CYGE2HFCVSLUJOK7AJ6MILAHS3374R7MQEAZTALS2A6GQZUYY6SAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 33 [3.804403]
[3.805371]
[3.805371]
```
#include "delay.h"
```
Replacement in crawl-ref/source/religion.cc at line 3131 [3.804403]
B:BD[4.3160] → [2.5533:5559]
```
    if (you.turn_is_over)
```
[4.3160]
[2.5559]
```
    if (you.turn_is_over || you_are_delayed())
```
Replacement in crawl-ref/source/religion.cc at line 3142 [3.804403]
B:BD[2.5617] → [2.5617:5647]
```
    ASSERT(you.turn_is_over);
```
[2.5617]
[2.5647]
```
    ASSERT(you.turn_is_over || you_are_delayed());
```

Replacement in crawl-ref/source/religion.cc at line 3155 [3.804403]

B:BD[5.2893] → [2.5739:5800]

        if ((mon->flags & NEW_GIFT_FLAGS) == NEW_GIFT_FLAGS)

[5.2893]

[2.5800]

        if ((mon->flags & NEW_GIFT_FLAGS) == NEW_GIFT_FLAGS
            && mon->god != GOD_XOM)

Deletion in crawl-ref/source/religion.cc at line 4806 [3.804403]
∅:D[6.2810] → [3.875925:875926]
∅:D[7.18932] → [3.875925:875926]
B:BD[3.875925] → [3.875925:875926]
B:BD[3.875926] → [2.6129:6184]
```
    if (you.turn_is_over)
        religion_turn_end();
```
Deletion in crawl-ref/source/religion.cc at line 4863 [3.804403]
B:BD[8.2862] → [2.6186:6242]
```
    if (you.turn_is_over)
        religion_turn_end();
```
Replacement in crawl-ref/source/religion.cc at line 6723 [3.804403]
B:BD[3.884725] → [2.6415:6441]
```
    if (you.turn_is_over)
```
[3.884725]
[2.6441]
```
    if (you.turn_is_over || you_are_delayed())
```
Replacement in crawl-ref/source/religion.cc at line 6851 [3.804403]
B:BD[2.6473] → [2.6473:6499]
```
    if (you.turn_is_over)
```
[2.6473]
[2.6499]
```
    if (you.turn_is_over || you_are_delayed())
```