fiddlerwoaroof/crawl - Change 5FHHUWTO4RQF244PHWV237WRNIXCZX5Q2KRX7VKDDUQWEXAL24NAC

Yet another attempt to fix problems with the monster "comes into view"

messsages. Such messages are not not flushed immediately upon the monster coming into view, but:

After world_reacts() is done.
When mpr() is called and the player is either delayed or repeating a command.

This should make sure that the "comes into view" message comes before any other messages the monster might give, and also fix the problem of the player moving into a monster's LOS, getting a "comes into view" message, and the monster then moving back out of LOS during the immediately following world_reacts(), which would leave the player puzzled as to why there's no monster in view.

As part of the change you.turn_is_over is set to true as soon as world_reacts() starts, which might cause bugs in other places, yet some play testing indicates that it's okay.

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

Created by zelgadis on January 20, 2009

5FHHUWTO4RQF244PHWV237WRNIXCZX5Q2KRX7VKDDUQWEXAL24NAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 1227 [5.16817]
B:BD[5.40202] → [2.383:432]
∅:D[2.432] → [6.305:355]
B:BD[6.305] → [6.305:355]
```
            if (player_monster_visible(monster))
                _handle_seen_interrupt(monster);
```
Deletion in crawl-ref/source/view.cc at line 1276 [5.16817]
B:BD[6.441] → [6.441:485]
```
        monster->flags &= ~MF_WAS_IN_VIEW;
```

Deletion in crawl-ref/source/view.cc at line 1277 [5.16817]

B:BD[6.486] → [4.7:181]

        // If the monster hasn't been seen by the time that the player
        // gets control back then seen_context is out of date.
        monster->seen_context.clear();

Insertion in crawl-ref/source/view.cc at line 1286 [5.16817]

[7.336]

[6.754]

                if (!(monster->flags & MF_WAS_IN_VIEW) && you.turn_is_over)
                    _handle_seen_interrupt(monster);

Insertion in crawl-ref/source/view.cc at line 1291 [5.16817]

[7.453]

[8.612]

            else
                monster->flags &= ~MF_WAS_IN_VIEW;

Insertion in crawl-ref/source/view.cc at line 1294 [5.16817]

[8.622]

        else
            monster->flags &= ~MF_WAS_IN_VIEW;
        // If the monster hasn't been seen by the time that the player
        // gets control back then seen_context is out of date.
        monster->seen_context.clear();

Replacement in crawl-ref/source/monstuff.cc at line 4915 [5.1396662]

B:BD[5.1467685] → [9.5350:5437]

∅:D[9.5437] → [10.2998:3075]

B:BD[11.357] → [10.2998:3075]

∅:D[10.3075] → [12.2624:2668]

B:BD[12.2624] → [12.2624:2668]

    if ((mons_class_flag(monster->type, M_SPEAKS)
         || !monster->mname.empty())
        && (!mons_is_wandering(monster) || monster->attitude == ATT_NEUTRAL)
        && one_chance_in(MON_SPEAK_CHANCE))

[5.1467685]

[5.1467794]

    if (monster->is_patrolling() || mons_is_wandering(monster)
        || monster->attitude == ATT_NEUTRAL)
    {
        // Very fast wandering/patrolling monsters might, in one monster turn,
        // move into the player's LOS and then back out (or the player
        // might move into their LOS and the monster move back out before
        // the player's view has a chance to update) so prevent them
        // from speaking.
        ;
    }
    else if ((mons_class_flag(monster->type, M_SPEAKS)
              || !monster->mname.empty())
             && one_chance_in(MON_SPEAK_CHANCE))

Deletion in crawl-ref/source/mon-util.cc at line 7586 [5.1699344]

B:BD[13.6853] → [3.2642:2769]

        // Force "comes into view" message to be given.
        if (see_new && !see_old)
            viewwindow(false, false);

Insertion in crawl-ref/source/message.cc at line 419 [5.1993826]
[14.556319]
[14.556319]
```
static bool _updating_view = false;
```

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

[15.4387]

    }
    // Flush out any "comes into view" monster announcements before the
    // monster has a chance to give any other messages.
    if (!_updating_view && you.turn_is_over
        && (you_are_delayed() || crawl_state.is_repeating_cmd()))
    {
        _updating_view = true;
        update_monsters_in_view();
        _updating_view = false;

Insertion in crawl-ref/source/acr.cc at line 1519 [5.4397395]
[16.28337]
[16.28337]
```
    update_monsters_in_view();
```
Deletion in crawl-ref/source/acr.cc at line 1524 [5.4397395]
∅:D[17.18460] → [5.4419969:4419970]
∅:D[14.1259181] → [5.4419969:4419970]
B:BD[5.4419969] → [5.4419969:4419970]
B:BD[5.4419970] → [6.3754:3785]
```
    update_monsters_in_view();
```
Insertion in crawl-ref/source/acr.cc at line 3116 [5.4397395]
[18.2031]
[19.14493]
```
    you.turn_is_over = true;
```

Yet another attempt to fix problems with the monster "comes into view"

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.cc at line 1227 [5.16817]

Deletion in crawl-ref/source/view.cc at line 1276 [5.16817]

Deletion in crawl-ref/source/view.cc at line 1277 [5.16817]

Insertion in crawl-ref/source/view.cc at line 1286 [5.16817]

Insertion in crawl-ref/source/view.cc at line 1291 [5.16817]

Insertion in crawl-ref/source/view.cc at line 1294 [5.16817]

Replacement in crawl-ref/source/monstuff.cc at line 4915 [5.1396662]

Deletion in crawl-ref/source/mon-util.cc at line 7586 [5.1699344]

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

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

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

Deletion in crawl-ref/source/acr.cc at line 1524 [5.4397395]

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