fiddlerwoaroof/crawl - Change I5FRVRMVT5RKXBMGO546MPF4H4ZHPAL5MXNGOU46MKJ3URNEWX7AC

If the user presses ESC in response to --more-- then automatically clear

all –more–s until the player can enter a command again, the player gets a prompt, or an error message is given.

Move where activity is interrupted on error messages, and also do that for error messages sent through formatted_mpr().

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

Created by zelgadis on December 21, 2008

I5FRVRMVT5RKXBMGO546MPF4H4ZHPAL5MXNGOU46MKJ3URNEWX7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/message.h at line 86 [5.1990888]
[5.1993551]
[5.1993551]
```
void reset_more_autoclear();
```

Deletion in crawl-ref/source/message.cc at line 371 [5.1993826]

B:BD[6.555978] → [7.3133:3216]


    if (channel == MSGCH_ERROR)
        interrupt_activity( AI_FORCE_INTERRUPT );

Insertion in crawl-ref/source/message.cc at line 692 [5.1993826]

[8.5511]

    if (channel == MSGCH_PROMPT || channel == MSGCH_ERROR)
        reset_more_autoclear();

Insertion in crawl-ref/source/message.cc at line 707 [5.1993826]

[9.5336]

[3.5497]


    if (channel == MSGCH_ERROR)
        interrupt_activity( AI_FORCE_INTERRUPT );

Insertion in crawl-ref/source/message.cc at line 762 [5.1993826]

[9.6268]

[10.3675]


    if (channel == MSGCH_PROMPT || channel == MSGCH_ERROR)
        reset_more_autoclear();
    if (channel == MSGCH_ERROR)
        interrupt_activity( AI_FORCE_INTERRUPT );

Insertion in crawl-ref/source/message.cc at line 861 [5.1993826]
[8.6345]
[5.2001455]
```
static bool autoclear_more = false;
```
Insertion in crawl-ref/source/message.cc at line 864 [5.1993826]
[5.2001456]
[5.2001456]
```
void reset_more_autoclear()
{
    autoclear_more = false;
}
```
Replacement in crawl-ref/source/message.cc at line 879 [5.1993826]
B:BD[11.10230] → [2.220:261]
```
    if (crawl_state.is_replaying_keys())
```
[11.10230]
[11.10311]
```
    if (crawl_state.is_replaying_keys() || autoclear_more)
```

Insertion in crawl-ref/source/message.cc at line 910 [5.1993826]

[4.2756]

[12.1062]

        if (keypress == ESCAPE)
            autoclear_more = true;

Insertion in crawl-ref/source/acr.cc at line 1527 [5.4397395]

[13.17714]

[14.572]

    // Stop autoclearing more now that we have control back.
    reset_more_autoclear();