fiddlerwoaroof/crawl - Change YKTMDZB5HVAP2IJGCOJQMIBH6CAD47O62SGRP4XNOAQ55EA3OSJQC

Add ASSERT(!crawl_state.arena) to a number of places.

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

Created by zelgadis on January 3, 2009

YKTMDZB5HVAP2IJGCOJQMIBH6CAD47O62SGRP4XNOAQ55EA3OSJQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 994 [5.293070]
[3.129391]
[4.4461]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/spells1.cc at line 65 [5.616635]
[5.617761]
[6.606]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/spells1.cc at line 199 [5.616635]
[5.619670]
[7.834]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 103 [5.962854]
[3.337573]
[8.17642]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 999 [5.962854]
[5.972003]
[5.972003]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 2900 [5.962854]
[5.1006618]
[9.16423]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 3592 [5.962854]
[5.1027122]
[10.3087]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4546 [5.962854]
[5.1049865]
[5.1049865]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4682 [5.962854]
[5.1051281]
[3.353352]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4706 [5.962854]
[5.1051514]
[5.1051514]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4729 [5.962854]
[5.1051791]
[9.16693]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4747 [5.962854]
[5.1052109]
[5.1052109]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4766 [5.962854]
[5.1052513]
[5.1052513]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4793 [5.962854]
[5.1053004]
[5.1053004]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4886 [5.962854]
[5.1054319]
[5.1054319]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4901 [5.962854]
[5.1054795]
[5.1054795]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 4926 [5.962854]
[5.1055368]
[5.1055368]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5021 [5.962854]
[11.4643]
[11.4643]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5096 [5.962854]
[12.2658]
[13.2842]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5130 [5.962854]
[13.3554]
[14.2495]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5160 [5.962854]
[5.1063651]
[13.3694]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5235 [5.962854]
[15.2483]
[13.5050]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5292 [5.962854]
[5.1065217]
[5.1065217]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5351 [5.962854]
[5.1066178]
[5.1066233]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 5433 [5.962854]
[5.1068034]
[5.1068034]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6429 [5.962854]
[16.6685]
[16.6685]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6495 [5.962854]
[17.2508]
[18.447]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6831 [5.962854]
[17.5591]
[17.5591]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6892 [5.962854]
[17.6591]
[19.2524]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6908 [5.962854]
[20.4088]
[20.4088]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 6970 [5.962854]
[21.115]
[21.115]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 7043 [5.962854]
[22.82]
[23.2984]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 7067 [5.962854]
[24.7587]
[25.3800]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 7106 [5.962854]
[26.675]
[27.181]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/player.cc at line 7130 [5.962854]
[26.1145]
[26.1145]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/misc.cc at line 1264 [5.1933596]
[5.1937095]
[28.176]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/misc.cc at line 2576 [5.1933596]
[5.1979348]
[29.7542]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/misc.cc at line 2593 [5.1933596]
[5.1981200]
[30.10609]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/fight.cc at line 4857 [5.3140790]
[17.82263]
[17.82263]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/fight.cc at line 4917 [5.3140790]
[17.83373]
[17.83373]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 161 [5.3382105]
[31.2930]
[32.5026]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 271 [5.3382105]
[33.2983]
[33.2983]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 318 [5.3382105]
[5.3384147]
[34.1515]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 466 [5.3382105]
[5.3384452]
[5.3384452]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 703 [5.3382105]
[5.3390890]
[35.2940]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 1533 [5.3382105]
[36.856]
[37.1121]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 2002 [5.3382105]
[5.3426397]
[5.3426397]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 2185 [5.3382105]
[38.3142]
[38.3142]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/effects.cc at line 3484 [5.3382105]
[39.18756]
[39.18770]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/delay.cc at line 299 [5.3963459]
[5.3964176]
[40.21992]
```
    ASSERT(!crawl_state.arena);
```
Insertion in crawl-ref/source/delay.cc at line 335 [5.3963459]
[3.995605]
[41.2910]
```
    ASSERT(!crawl_state.arena);
```

Replacement in crawl-ref/source/arena.cc at line 365 [2.10815]

B:BD[2.18065] → [2.18065:18097]

        // Fix up the viewport.

[2.18065]

[2.18097]

        // Fix up the viewport.  Temporarily unset arena mode to avoid
        // assertion.
        crawl_state.arena = false;

Insertion in crawl-ref/source/arena.cc at line 369 [2.10815]
[2.18125]
[2.18125]
```
        crawl_state.arena = true;
```

Add ASSERT(!crawl_state.arena) to a number of places.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 994 [5.293070]

Insertion in crawl-ref/source/spells1.cc at line 65 [5.616635]

Insertion in crawl-ref/source/spells1.cc at line 199 [5.616635]

Insertion in crawl-ref/source/player.cc at line 103 [5.962854]

Insertion in crawl-ref/source/player.cc at line 999 [5.962854]

Insertion in crawl-ref/source/player.cc at line 2900 [5.962854]

Insertion in crawl-ref/source/player.cc at line 3592 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4546 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4682 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4706 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4729 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4747 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4766 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4793 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4886 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4901 [5.962854]

Insertion in crawl-ref/source/player.cc at line 4926 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5021 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5096 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5130 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5160 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5235 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5292 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5351 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5433 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6429 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6495 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6831 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6892 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6908 [5.962854]

Insertion in crawl-ref/source/player.cc at line 6970 [5.962854]

Insertion in crawl-ref/source/player.cc at line 7043 [5.962854]

Insertion in crawl-ref/source/player.cc at line 7067 [5.962854]

Insertion in crawl-ref/source/player.cc at line 7106 [5.962854]

Insertion in crawl-ref/source/player.cc at line 7130 [5.962854]

Insertion in crawl-ref/source/misc.cc at line 1264 [5.1933596]

Insertion in crawl-ref/source/misc.cc at line 2576 [5.1933596]

Insertion in crawl-ref/source/misc.cc at line 2593 [5.1933596]

Insertion in crawl-ref/source/fight.cc at line 4857 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 4917 [5.3140790]

Insertion in crawl-ref/source/effects.cc at line 161 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 271 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 318 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 466 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 703 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 1533 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 2002 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 2185 [5.3382105]

Insertion in crawl-ref/source/effects.cc at line 3484 [5.3382105]

Insertion in crawl-ref/source/delay.cc at line 299 [5.3963459]

Insertion in crawl-ref/source/delay.cc at line 335 [5.3963459]

Replacement in crawl-ref/source/arena.cc at line 365 [2.10815]

Insertion in crawl-ref/source/arena.cc at line 369 [2.10815]