fiddlerwoaroof/crawl - Change O6SX3NYKNE2YSFLFOXGJQGL7SMVDFQYDQG6OR6MUEPVQKBRI45XQC

Move the prompt on entering a level that is marked as dangerous via

annotation or exclusion before the delay is started, so it doesn't cost a turn.

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

Created by j-p-e-g on June 23, 2008

O6SX3NYKNE2YSFLFOXGJQGL7SMVDFQYDQG6OR6MUEPVQKBRI45XQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/misc.h at line 85 [4.1928926]
[4.1932716]
[5.8909]
```
bool check_annotation_exclusion_warning();
```
Replacement in crawl-ref/source/misc.cc at line 1441 [4.1933596]
B:BD[3.3138] → [3.3138:3188]
```
static bool _check_annotation_exclusion_warning()
```
[3.3138]
[3.3188]
```
bool check_annotation_exclusion_warning()
```
Replacement in crawl-ref/source/misc.cc at line 1470 [4.1933596]
B:BD[3.4168] → [3.4168:4190]
```
        return false;
```
[3.4168]
[3.4190]
```
        return (false);
```
Replacement in crawl-ref/source/misc.cc at line 1472 [4.1933596]
B:BD[3.4196] → [3.4196:4213]
```
    return true;
```
[3.4196]
[3.4213]
```
    return (true);
```

Replacement in crawl-ref/source/misc.cc at line 1503 [4.1933596]

B:BD[6.16596] → [3.4217:4297]

    if (!force_stair && !_check_annotation_exclusion_warning())
        return;

[6.16596]

[4.1944249]

//    if (!force_stair && !check_annotation_exclusion_warning())
//        return;

Insertion in crawl-ref/source/misc.cc at line 1817 [4.1933596]

[4.1949852]

[7.873]

    // Does the next level have a warning annotation?
//    if (!force_stair && !check_annotation_exclusion_warning())
//        return;

Deletion in crawl-ref/source/misc.cc at line 1865 [4.1933596]
B:BD[6.18993] → [6.18993:19047]
B:BD[6.19047] → [3.4298:4378]
∅:D[3.4378] → [6.19515:19516]
∅:D[8.11505] → [6.19515:19516]
B:BD[6.19515] → [6.19515:19516]
```
    // Does the next level have a warning annotation?
    if (!force_stair && !_check_annotation_exclusion_warning())
        return;
```
Replacement in crawl-ref/source/acr.cc at line 1670 [4.4397395]
B:BD[9.296] → [10.16275:16318]
```
        if ( you.duration[DUR_BERSERKER] )
```
[9.296]
[9.325]
```
        if (you.duration[DUR_BERSERKER])
```
Replacement in crawl-ref/source/acr.cc at line 1681 [4.4397395]
B:BD[2.1271] → [2.1271:1315]
```
            mpr( "You can't go up here!" );
```
[2.1271]
[11.1260640]
```
            mpr("You can't go up here!");
```

Insertion in crawl-ref/source/acr.cc at line 1684 [4.4397395]

[11.1260662]

[4.4421580]


    // Does the next level have a warning annotation?
    if (!check_annotation_exclusion_warning())
        return;

Insertion in crawl-ref/source/acr.cc at line 1724 [4.4397395]

[12.4894]

[13.1100]


    // Does the next level have a warning annotation?
    if (!check_annotation_exclusion_warning())
        return;