fiddlerwoaroof/crawl - Change S2XL2O3WVDHAXO3YUNSSGG6PTSV5EWBIIZOOG6KRK5P5LTH2YCFQC

When doing something after _ouch() in a spell miscast, check for the

target's being alive first. Among other things, this fixes an assertion failure when a translocation miscast kills a monster, and then attempts to blink the dead monster afterward. Don't bother to check for being alive if the miscast effect is player-only, of course, since, once the player's dead, the game's over.

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

Created by dolorous on January 10, 2009

S2XL2O3WVDHAXO3YUNSSGG6PTSV5EWBIIZOOG6KRK5P5LTH2YCFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 3290 [5.293070]

B:BD[3.33114] → [4.5279:5324]

            if (_ouch(4 + random2avg(7, 2)))

[3.33114]

[4.5324]

            if (_ouch(4 + random2avg(7, 2)) && target->alive())

Replacement in crawl-ref/source/spl-cast.cc at line 3319 [5.293070]
B:BD[3.33893] → [3.33893:33894]
B:BD[3.33894] → [2.373:418]
```
            if (_ouch(5 + random2avg(9, 2)))
```
[3.33893]
[2.418]
```
            if (_ouch(5 + random2avg(9, 2)) && target->alive())
```
Deletion in crawl-ref/source/spl-cast.cc at line 3325 [5.293070]
∅:D[2.577] → [6.9230:9231]
∅:D[3.34015] → [6.9230:9231]
B:BD[6.9230] → [6.9230:9231]
Replacement in crawl-ref/source/spl-cast.cc at line 3364 [5.293070]
∅:D[6.9991] → [5.356625:356626]
∅:D[7.28048] → [5.356625:356626]
∅:D[3.34943] → [5.356625:356626]
B:BD[5.356625] → [5.356625:356626]
B:BD[5.356626] → [2.644:690]
```
            if (_ouch(9 + random2avg(17, 2)))
```
[3.34943]
[2.690]
```
            if (_ouch(9 + random2avg(17, 2)) && target->alive())
```
Deletion in crawl-ref/source/spl-cast.cc at line 3787 [5.293070]
∅:D[8.199] → [5.366910:366924]
∅:D[6.19342] → [5.366910:366924]
∅:D[3.40246] → [5.366910:366924]
B:BD[5.366910] → [5.366910:366924]
```
            {
```
Deletion in crawl-ref/source/spl-cast.cc at line 3788 [5.293070]
B:BD[5.368107] → [5.368107:368121]
```
            }
```
Deletion in crawl-ref/source/spl-cast.cc at line 4169 [5.293070]
∅:D[6.26846] → [5.378060:378061]
∅:D[3.47662] → [5.378060:378061]
B:BD[5.378060] → [5.378060:378061]
Replacement in crawl-ref/source/spl-cast.cc at line 4176 [5.293070]
B:BD[3.47792] → [3.47792:47845]
∅:D[6.26963] → [5.378187:378188]
∅:D[3.47845] → [5.378187:378188]
B:BD[5.378187] → [5.378187:378188]
```
            target->expose_to_element(BEAM_FIRE, 3);
```
[3.47792]
[6.26964]
```
            if (target->alive())
                target->expose_to_element(BEAM_FIRE, 3);
```
Replacement in crawl-ref/source/spl-cast.cc at line 4189 [5.293070]
∅:D[9.205] → [5.378338:378339]
∅:D[6.27160] → [5.378338:378339]
∅:D[3.48040] → [5.378338:378339]
B:BD[5.378338] → [5.378338:378339]
B:BD[5.378339] → [4.7617:7674]
```
            if (_ouch(5 + random2avg(29, 2), BEAM_FIRE))
```
[3.48040]
[4.7674]
```
            if (_ouch(5 + random2avg(29, 2), BEAM_FIRE) && target->alive())
```
Replacement in crawl-ref/source/spl-cast.cc at line 4216 [5.293070]
∅:D[6.28183] → [5.379234:379235]
∅:D[3.48837] → [5.379234:379235]
B:BD[5.379234] → [5.379234:379235]
B:BD[5.379235] → [4.7732:7789]
```
            if (_ouch(9 + random2avg(33, 2), BEAM_FIRE))
```
[3.48837]
[4.7789]
```
            if (_ouch(9 + random2avg(33, 2), BEAM_FIRE) && target->alive())
```
Deletion in crawl-ref/source/spl-cast.cc at line 4336 [5.293070]
∅:D[6.30831] → [5.382028:382029]
∅:D[3.51198] → [5.382028:382029]
∅:D[10.136130] → [5.382028:382029]
B:BD[5.382028] → [5.382028:382029]

Replacement in crawl-ref/source/spl-cast.cc at line 4343 [5.293070]

B:BD[3.51327] → [3.51327:51380]

            target->expose_to_element(BEAM_COLD, 2);

[3.51327]

[5.382189]

            if (target->alive())
                target->expose_to_element(BEAM_COLD, 2);

Replacement in crawl-ref/source/spl-cast.cc at line 4355 [5.293070]
∅:D[6.31250] → [5.382513:382514]
∅:D[3.51538] → [5.382513:382514]
B:BD[5.382513] → [5.382513:382514]
B:BD[5.382514] → [4.7955:8018]
```
            if (_ouch(5 + random2(6) + random2(7), BEAM_COLD))
```
[3.51478]
[4.8018]
```
            if (_ouch(5 + random2(6) + random2(7), BEAM_COLD) && target->alive())
```
Replacement in crawl-ref/source/spl-cast.cc at line 4381 [5.293070]
∅:D[6.32232] → [5.383546:383547]
∅:D[3.52255] → [5.383546:383547]
B:BD[5.383546] → [5.383546:383547]
B:BD[5.383547] → [4.8076:8132]
```
            if (_ouch(9 + random2avg(23, 2), BEAM_ICE))
```
[3.52202]
[4.8132]
```
            if (_ouch(9 + random2avg(23, 2), BEAM_ICE) && target->alive())
```

Replacement in crawl-ref/source/spl-cast.cc at line 4513 [5.293070]

B:BD[5.389169] → [3.54930:55010]

            _ouch(random2avg(13,2) + 10 - random2(1 + target->armour_class()));

[5.389169]

            _ouch(random2avg(13, 2) + 10 - random2(1 + target->armour_class()));

When doing something after _ouch() in a spell miscast, check for the

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 3290 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3319 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3325 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3364 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3787 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3788 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 4169 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4176 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4189 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4216 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 4336 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4343 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4355 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4381 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 4513 [5.293070]