fiddlerwoaroof/crawl - Change DGPZZUWTMWADFTFLZ37DHWXXDXMBZHROCFTYL472HI6ETGEK6CBAC

Simplify the code that issues the "comes into view" monster interrupt message,

so we don't have to check in multiple places to make sure that "comes into view" is given before any of the other monster messages.

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

Created by zelgadis on January 19, 2009

DGPZZUWTMWADFTFLZ37DHWXXDXMBZHROCFTYL472HI6ETGEK6CBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.h at line 254 [6.13254]
B:BD[4.1167] → [5.4:32]
```
void fire_monster_alerts();
```
[4.1167]
[4.1167]
```
void update_monsters_in_view();
```
Deletion in crawl-ref/source/view.cc at line 874 [6.16817]
B:BD[7.8] → [7.8:67]
```
static std::set<const monsters*> monsters_seen_this_turn;
```
Deletion in crawl-ref/source/view.cc at line 875 [6.16817]
B:BD[7.68] → [8.2073:2132]
∅:D[8.2132] → [7.126:222]
B:BD[7.126] → [7.126:222]
∅:D[7.222] → [9.8182:8184]
∅:D[10.692] → [9.8182:8184]
B:BD[9.8182] → [9.8182:8184]
B:BD[9.8184] → [11.8:9]
```
static bool _mons_was_seen_this_turn(const monsters *mons)
{
    return (monsters_seen_this_turn.find(mons) !=
            monsters_seen_this_turn.end());
}
```

Insertion in crawl-ref/source/view.cc at line 953 [6.16817]

[12.71]

    if (mons_is_mimic(monster->type)
        && !mons_is_known_mimic(monster))
    {
        return;
    }

Replacement in crawl-ref/source/view.cc at line 968 [6.16817]

∅:D[13.38] → [12.397:501]

B:BD[12.397] → [12.397:501]

        && !mons_class_flag( monster->type, M_NO_EXP_GAIN )
        && !mons_is_mimic( monster->type ))

[13.38]

[12.501]

        && !mons_class_flag(monster->type, M_NO_EXP_GAIN))

Insertion in crawl-ref/source/view.cc at line 971 [6.16817]
[12.558]
[14.4412]
```
        monster->seen_context.clear();
```
Deletion in crawl-ref/source/view.cc at line 974 [6.16817]
B:BD[12.588] → [12.588:663]
```
    // Monster was viewed this turn
    monster->flags |= MF_WAS_IN_VIEW;
```
Replacement in crawl-ref/source/view.cc at line 1081 [6.16817]
B:BD[15.3726] → [15.3726:3736]
```
     else
```
[15.3726]
[15.3736]
```
    else
```

Insertion in crawl-ref/source/view.cc at line 1224 [6.16817]

[6.40202]

[16.7]

            if (mons_player_visible(monster))
                _handle_seen_interrupt(monster);

Deletion in crawl-ref/source/view.cc at line 1232 [6.16817]

B:BD[3.68] → [3.68:163]

                if (you.can_see(monster))
                    _handle_seen_interrupt(monster);

Deletion in crawl-ref/source/view.cc at line 1260 [6.16817]

∅:D[17.55] → [7.224:563]

∅:D[18.1302] → [7.224:563]

B:BD[7.224] → [7.224:563]

∅:D[7.563] → [6.46256:46257]

∅:D[4.10462] → [6.46256:46257]

B:BD[6.46256] → [6.46256:46257]

            if (player_monster_visible(monster)
                && !mons_is_submerged(monster)
                && !mons_friendly(monster)
                && !mons_class_flag(monster->type, M_NO_EXP_GAIN)
                && !mons_is_mimic(monster->type))
            {
                monsters_seen_this_turn.insert(monster);
            }

Replacement in crawl-ref/source/view.cc at line 1266 [6.16817]
B:BD[6.47048] → [5.34:61]
```
void fire_monster_alerts()
```
[6.47048]
[5.61]
```
void update_monsters_in_view()
```

Replacement in crawl-ref/source/view.cc at line 1274 [6.16817]

B:BD[6.47049] → [7.564:616]

        if (monster->alive() && mons_near(monster))

[6.47049]

[5.206]

        if (!monster->alive())
            continue;
        monster->flags &= ~MF_WAS_IN_VIEW;
        if (mons_near(monster))

Replacement in crawl-ref/source/view.cc at line 1281 [6.16817]

B:BD[5.216] → [7.617:666]

B:BD[7.666] → [8.2684:2741]

∅:D[8.2741] → [19.6:56]

B:BD[7.720] → [19.6:56]

∅:D[20.51] → [5.480:494]

∅:D[19.56] → [5.480:494]

B:BD[5.480] → [5.480:494]

B:BD[5.494] → [8.2742:2791]

            if ((player_monster_visible(monster)
                   || _mons_was_seen_this_turn(monster))
                && !mons_is_submerged( monster ))
            {
                _handle_seen_interrupt(monster);

[5.216]

[21.5653]

            if (monster->attitude == ATT_HOSTILE)
                num_hostile++;

Replacement in crawl-ref/source/view.cc at line 1284 [6.16817]

B:BD[21.5654] → [22.7:61]

∅:D[22.61] → [21.5713:5748]

B:BD[21.5713] → [21.5713:5748]

∅:D[19.304] → [5.598:612]

∅:D[21.5748] → [5.598:612]

B:BD[5.598] → [5.598:612]

B:BD[5.612] → [19.305:322]

                if (monster->attitude == ATT_HOSTILE)
                    num_hostile++;
            }
            else

[21.5654]

[19.322]

            if (player_monster_visible(monster)
                && (!mons_is_mimic(monster->type)
                    || mons_is_known_mimic(monster)))

Replacement in crawl-ref/source/view.cc at line 1288 [6.16817]

B:BD[19.336] → [19.336:439]

                // Monster was not viewed this turn
                monster->flags &= ~MF_WAS_IN_VIEW;

[19.336]

[19.439]

                seen_monster(monster);

Deletion in crawl-ref/source/view.cc at line 1291 [6.16817]

B:BD[5.622] → [19.454:582]

B:BD[19.582] → [23.7:46]

        else
        {
            // Monster was not viewed this turn
            monster->flags &= ~MF_WAS_IN_VIEW;
        }
        monster->seen_context.clear();

Deletion in crawl-ref/source/view.cc at line 1307 [6.16817]
B:BD[21.6398] → [21.6398:6399]
∅:D[21.6399] → [7.722:759]
B:BD[7.722] → [7.722:759]
```
    monsters_seen_this_turn.clear();
```
Deletion in crawl-ref/source/mstuff2.cc at line 137 [6.1340842]
B:BD[6.1351629] → [6.1351629:1351630]
B:BD[6.1351630] → [24.2633:2733]
B:BD[24.2733] → [2.2713:2770]
∅:D[2.2770] → [25.2691:2744]
B:BD[25.2691] → [25.2691:2744]
∅:D[25.2744] → [24.2794:2825]
B:BD[24.2794] → [24.2794:2825]
B:BD[24.2825] → [25.2745:2751]
```
    // Make sure the "comes into view" type messages are displayed before
    // the spell is cast.
    if (monsterNearby && player_monster_visible(monster)
        && !(monster->flags & MF_WAS_IN_VIEW))
    {
        fire_monster_alerts();
    }
```

Deletion in crawl-ref/source/monstuff.cc at line 4888 [6.1396662]

B:BD[26.12531] → [25.2755:3061]

// Make sure the "comes into view" type messages are displayed before
// special/nearby abilites are used.
void _flush_monster_alerts(const monsters* mons)
{
    if (!(mons->flags & MF_WAS_IN_VIEW) && player_monster_visible(mons)
        && you_are_delayed())
    {
        fire_monster_alerts();
    }
}

Deletion in crawl-ref/source/monstuff.cc at line 4969 [6.1396662]
B:BD[27.2839] → [25.3062:3124]
```
            {
                _flush_monster_alerts(monster);
```
Deletion in crawl-ref/source/monstuff.cc at line 4972 [6.1396662]
B:BD[27.2995] → [25.3125:3139]
```
            }
```
Deletion in crawl-ref/source/monstuff.cc at line 4987 [6.1396662]
B:BD[6.1468509] → [25.3140:3184]
```
            _flush_monster_alerts(monster);
```
Deletion in crawl-ref/source/monstuff.cc at line 5108 [6.1396662]
B:BD[6.1471373] → [25.3185:3222]
```
    _flush_monster_alerts(monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 8709 [6.1396662]

[28.7365]

[29.8947]

    // Monster was viewed this turn
    monster->flags |= MF_WAS_IN_VIEW;
    monster->seen_context.clear();

Deletion in crawl-ref/source/monspeak.cc at line 740 [6.1558496]

B:BD[25.3271] → [25.3271:3483]

    // Make sure the "comes into view" type messages are displayed before
    // the monster speaks.
    if (player_monster_visible(monster) && !(monster->flags & MF_WAS_IN_VIEW))
        fire_monster_alerts();

Replacement in crawl-ref/source/acr.cc at line 1524 [6.4397395]
B:BD[6.4419970] → [5.840:867]
```
    fire_monster_alerts();
```
[6.4419970]
[30.273]
```
    update_monsters_in_view();
```

Simplify the code that issues the "comes into view" monster interrupt message,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.h at line 254 [6.13254]

Deletion in crawl-ref/source/view.cc at line 874 [6.16817]

Deletion in crawl-ref/source/view.cc at line 875 [6.16817]

Insertion in crawl-ref/source/view.cc at line 953 [6.16817]

Replacement in crawl-ref/source/view.cc at line 968 [6.16817]

Insertion in crawl-ref/source/view.cc at line 971 [6.16817]

Deletion in crawl-ref/source/view.cc at line 974 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1081 [6.16817]

Insertion in crawl-ref/source/view.cc at line 1224 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1232 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1260 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1266 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1274 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1281 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1284 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1288 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1291 [6.16817]

Deletion in crawl-ref/source/view.cc at line 1307 [6.16817]

Deletion in crawl-ref/source/mstuff2.cc at line 137 [6.1340842]

Deletion in crawl-ref/source/monstuff.cc at line 4888 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4969 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4972 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 4987 [6.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 5108 [6.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8709 [6.1396662]

Deletion in crawl-ref/source/monspeak.cc at line 740 [6.1558496]

Replacement in crawl-ref/source/acr.cc at line 1524 [6.4397395]