fiddlerwoaroof/crawl - Change IH5TVAZGKN7IQOTSOJ56WG5C3CMTG3AI63XT3XVNHC7DI4N2TSUAC

Make extra-sure that a monster won't be announced to have come into view, only

to immediately move out of view, by introducing the notion of the currently acting monster to crawl_state, and only flushing out the "comes into view" message in mpr() for the currently acting monster. Not sure if it's worth it just for the sake of avoiding doing a "has this monster just now come into view" check in every place that a monster might issue a message, but at least this way we won't miss any places such a check should be placed.

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

Created by zelgadis on January 20, 2009

IH5TVAZGKN7IQOTSOJ56WG5C3CMTG3AI63XT3XVNHC7DI4N2TSUAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 255 [7.13254]
[5.38]
[6.1167]
```
void flush_comes_into_view();
```

Insertion in crawl-ref/source/view.cc at line 975 [7.16817]

[8.4421]

[9.74]

void flush_comes_into_view()
{
    if (!you.turn_is_over
        || (!you_are_delayed() && !crawl_state.is_repeating_cmd()))
    {
        return;
    }
    monsters* mon = crawl_state.which_mon_acting();
    if (!mon || !mon->alive() || (mon->flags & MF_WAS_IN_VIEW)
        || !you.can_see(mon))
    {
        return;
    }
    _handle_seen_interrupt(mon);
}

Insertion in crawl-ref/source/view.cc at line 1020 [7.16817]
[10.773]
[11.484]
```
    mon_acting mact(monster);
```
Insertion in crawl-ref/source/state.h at line 16 [13.42804]
[12.1191]
[12.1191]
```
class monsters;
class mon_acting;
```

Insertion in crawl-ref/source/state.h at line 89 [13.42804]

[13.44591]

[14.1206]

    monsters*              mon_act;
    std::vector<monsters*> mon_act_stack;

Insertion in crawl-ref/source/state.h at line 128 [13.42804]

[12.1850]

[3.406]


    bool      is_mon_acting() const;
    monsters* which_mon_acting() const;
    void      inc_mon_acting(monsters* mon);
    void      dec_mon_acting(monsters* mon);
    void      clear_mon_acting();
    void      mon_gone(monsters* mon);

Insertion in crawl-ref/source/state.h at line 137 [13.42804]
[3.434]
[13.44711]
```
    friend class mon_acting;
```

Insertion in crawl-ref/source/state.h at line 164 [13.42804]

[13.44746]

class mon_acting
{
public:
    mon_acting(monsters* _mon) : mon(_mon)
    {
        crawl_state.inc_mon_acting(_mon);
    }
    ~mon_acting()
    {
        // Monster might have died in the meantime.
        if (mon == crawl_state.mon_act)
            crawl_state.dec_mon_acting(mon);
    }
private:
    monsters *mon;
};

Insertion in crawl-ref/source/state.cc at line 375 [14.1546]

[12.4109]

[3.537]

}
bool game_state::is_mon_acting() const
{
    return (mon_act != NULL);
}
monsters* game_state::which_mon_acting() const
{
    return (mon_act);
}
void game_state::inc_mon_acting(monsters* mon)
{
    ASSERT(!invalid_monster(mon));
    if (mon_act != NULL)
        mon_act_stack.push_back(mon_act);
    mon_act = mon;

Insertion in crawl-ref/source/state.cc at line 396 [14.1546]

[3.539]


void game_state::dec_mon_acting(monsters* mon)
{
    ASSERT(mon_act == mon);

Insertion in crawl-ref/source/state.cc at line 401 [14.1546]

[3.540]

    mon_act = NULL;
    if (mon_act_stack.size() > 0)
    {
        mon_act = *(mon_act_stack.end());
        ASSERT(!invalid_monster(mon_act));
        mon_act_stack.pop_back();
    }
}
void game_state::clear_mon_acting()
{
    mon_act = NULL;
    mon_act_stack.clear();
}
void game_state::mon_gone(monsters* mon)
{
    for (unsigned int i = 0, size = mon_act_stack.size(); i < size; i++)
    {
        if (mon_act_stack[i] == mon)
        {
            mon_act_stack.erase(mon_act_stack.begin() + i);
            i--;
        }
    }
    if (mon_act == mon)
        dec_mon_acting(mon);
}

Insertion in crawl-ref/source/monstuff.cc at line 1032 [7.1396662]
[15.3703]
[16.2987]
```
    crawl_state.inc_mon_acting(monster);
```
Insertion in crawl-ref/source/monstuff.cc at line 1667 [7.1396662]
[2.3078]
[7.1418882]
```
    crawl_state.dec_mon_acting(monster);
```
Insertion in crawl-ref/source/monstuff.cc at line 1682 [7.1396662]
[7.1419033]
[7.1419033]
```
    crawl_state.mon_gone(monster);
```
Insertion in crawl-ref/source/monstuff.cc at line 6747 [7.1396662]
[6.429248]
[17.7530]
```
    mon_acting mact(monster);
```
Insertion in crawl-ref/source/monspeak.cc at line 739 [7.1558496]
[18.3270]
[18.3270]
```
    mon_acting mact(const_cast<monsters*>(monster));
```
Insertion in crawl-ref/source/mon-util.cc at line 7910 [7.1699344]
[19.6727]
[19.6727]
```
        mon_acting mact(this);
```

Replacement in crawl-ref/source/message.cc at line 466 [7.1993826]

B:BD[4.3865] → [4.3865:3975]

    if (!_updating_view && you.turn_is_over
        && (you_are_delayed() || crawl_state.is_repeating_cmd()))

[4.3865]

[4.3975]

    if (!_updating_view)

Replacement in crawl-ref/source/message.cc at line 469 [7.1993826]
B:BD[4.4012] → [4.4012:4047]
```
        update_monsters_in_view();
```
[4.4012]
[4.4047]
```
        flush_comes_into_view();
```
Insertion in crawl-ref/source/acr.cc at line 1502 [7.4397395]
[20.839]
[21.3825]
```
    crawl_state.clear_mon_acting();
```
Replacement in crawl-ref/source/acr.cc at line 3118 [7.4397395]
B:BD[22.2031] → [4.4308:4337]
```
    you.turn_is_over = true;
```
[22.2031]
[4.4337]
```
    crawl_state.clear_mon_acting();
```
Insertion in crawl-ref/source/acr.cc at line 3121 [7.4397395]
[23.14521]
[23.14521]
```
    {
        you.turn_is_over = true;
```
Insertion in crawl-ref/source/acr.cc at line 3124 [7.4397395]
[23.14550]
[23.14550]
```
        crawl_state.clear_god_acting();
    }
```
Deletion in crawl-ref/source/acr.cc at line 3127 [7.4397395]
∅:D[23.14551] → [12.5220:5256]
B:BD[22.2031] → [12.5220:5256]
B:BD[12.5256] → [24.225717:225718]
```
    crawl_state.clear_god_acting();
```

Make extra-sure that a monster won't be announced to have come into view, only

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 255 [7.13254]

Insertion in crawl-ref/source/view.cc at line 975 [7.16817]

Insertion in crawl-ref/source/view.cc at line 1020 [7.16817]

Insertion in crawl-ref/source/state.h at line 16 [13.42804]

Insertion in crawl-ref/source/state.h at line 89 [13.42804]

Insertion in crawl-ref/source/state.h at line 128 [13.42804]

Insertion in crawl-ref/source/state.h at line 137 [13.42804]

Insertion in crawl-ref/source/state.h at line 164 [13.42804]

Insertion in crawl-ref/source/state.cc at line 375 [14.1546]

Insertion in crawl-ref/source/state.cc at line 396 [14.1546]

Insertion in crawl-ref/source/state.cc at line 401 [14.1546]

Insertion in crawl-ref/source/monstuff.cc at line 1032 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1667 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1682 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6747 [7.1396662]

Insertion in crawl-ref/source/monspeak.cc at line 739 [7.1558496]

Insertion in crawl-ref/source/mon-util.cc at line 7910 [7.1699344]

Replacement in crawl-ref/source/message.cc at line 466 [7.1993826]

Replacement in crawl-ref/source/message.cc at line 469 [7.1993826]

Insertion in crawl-ref/source/acr.cc at line 1502 [7.4397395]

Replacement in crawl-ref/source/acr.cc at line 3118 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3121 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 3124 [7.4397395]

Deletion in crawl-ref/source/acr.cc at line 3127 [7.4397395]