fiddlerwoaroof/crawl - Change SMU5ZZAOLDQHWD4ECEM7VQTERSTXUCOPMPQXDGMOR5N3ELR3EVTQC

Fix bug #2510205: prevent monsters from using visual speech messages when

the player can't see them.

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

Created by zelgadis on January 15, 2009

SMU5ZZAOLDQHWD4ECEM7VQTERSTXUCOPMPQXDGMOR5N3ELR3EVTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monspeak.cc at line 117 [4.1558496]

B:BD[3.3520] → [3.3520:3576]

                         bool no_foe_name, bool no_god)

[3.3520]

[3.3576]

                         bool no_foe_name, bool no_god, bool unseen)

Insertion in crawl-ref/source/monspeak.cc at line 155 [4.1558496]

[3.4626]

        return (true);
    if (unseen && msg.find("VISUAL") != std::string::npos)

Insertion in crawl-ref/source/monspeak.cc at line 167 [4.1558496]

[3.4947]

                                     bool unseen,

Replacement in crawl-ref/source/monspeak.cc at line 194 [4.1558496]

B:BD[3.5844] → [3.5844:5915]

        if (_invalid_msg(msg, no_player, no_foe, no_foe_name, no_god))

[3.5844]

[3.5915]

        if (_invalid_msg(msg, no_player, no_foe, no_foe_name, no_god, unseen))

Replacement in crawl-ref/source/monspeak.cc at line 209 [4.1558496]

B:BD[3.6294] → [3.6294:6363]

                                      bool no_foe_name, bool no_god)

[3.6294]

[5.6707]

                                      bool no_foe_name, bool no_god,
                                      bool unseen)

Replacement in crawl-ref/source/monspeak.cc at line 213 [4.1558496]

B:BD[3.6438] → [3.6438:6500]

                                        no_foe_name, no_god);

[3.6438]

[6.10284]

                                        no_foe_name, no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 278 [4.1558496]

B:BD[3.6769] → [3.6769:6837]

                                     bool no_foe_name, bool no_god)

[3.6769]

[3.6837]

                                     bool no_foe_name, bool no_god,
                                     bool unseen)

Replacement in crawl-ref/source/monspeak.cc at line 284 [4.1558496]

B:BD[7.3509] → [7.3509:3552]

    else if (monster->flags & MF_BANISHED)

[7.3509]

[7.3552]

    else if ((monster->flags & MF_BANISHED) && you.level_type != LEVEL_ABYSS)

Replacement in crawl-ref/source/monspeak.cc at line 294 [4.1558496]

B:BD[3.7000] → [3.7000:7053]

                               no_foe_name, no_god);

[3.7000]

[3.7053]

                               no_foe_name, no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 310 [4.1558496]

B:BD[3.7449] → [3.7449:7520]

        if (_invalid_msg(msg, no_player, no_foe, no_foe_name, no_god))

[3.7449]

[3.7520]

        if (_invalid_msg(msg, no_player, no_foe, no_foe_name, no_god, unseen))

Replacement in crawl-ref/source/monspeak.cc at line 374 [4.1558496]
∅:D[2.2816] → [7.3796:3819]
B:BD[7.3796] → [7.3796:3819]
```
    int duration = -1;
```
[2.2816]
[7.3819]
```
    int duration = 1;
```

Replacement in crawl-ref/source/monspeak.cc at line 376 [4.1558496]

B:BD[7.3866] → [7.3866:3972]

        || !(monster->flags & MF_BANISHED)
        || (monster->is_summoned(&duration) && duration <= 0);

[7.3866]

[7.3972]

        || (monster->flags & MF_BANISHED) && you.level_type != LEVEL_ABYSS
        || (monster->is_summoned(&duration) && duration <= 0)
        || crawl_state.prev_cmd == CMD_LOOK_AROUND; // Wizard testing
    const bool unseen   = !you.can_see(monster);
    const bool confused = monster->confused();

Replacement in crawl-ref/source/monspeak.cc at line 390 [4.1558496]

B:BD[7.4308] → [7.4308:4462]

       if (monster->invisible() && !(player_monster_visible(monster)
                                     && monster->has_ench(ENCH_CONFUSION)))
       {

[7.4308]

[7.4462]

       if (unseen && !confused);

Deletion in crawl-ref/source/monspeak.cc at line 392 [4.1558496]
B:BD[7.4489] → [7.4489:4498]
```
       }
```
Replacement in crawl-ref/source/monspeak.cc at line 440 [4.1558496]
∅:D[8.3489] → [9.10889:10932]
∅:D[10.10860] → [9.10889:10932]
B:BD[4.1562462] → [9.10889:10932]
```
    if (monster->has_ench(ENCH_CONFUSION))
```
[10.10860]
[10.10861]
```
    if (confused)
```

Replacement in crawl-ref/source/monspeak.cc at line 530 [4.1558496]

B:BD[3.9570] → [3.9570:9643]

                                no_player, no_foe, no_foe_name, no_god);

[3.9570]

[11.5229]

                                no_player, no_foe, no_foe_name, no_god,
                                unseen);

Replacement in crawl-ref/source/monspeak.cc at line 538 [4.1558496]

B:BD[3.9721] → [3.9721:9766]

                                    no_god);

[3.9721]

[12.6362]

                                    no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 543 [4.1558496]

B:BD[3.9844] → [3.9844:9889]

                                    no_god);

[3.9844]

[12.6512]

                                    no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 552 [4.1558496]

B:BD[5.8421] → [3.9890:9963]

                       monster, no_player, no_foe, no_foe_name, no_god);

[5.8421]

[13.3385]

                       monster, no_player, no_foe, no_foe_name, no_god,
                       unseen);

Replacement in crawl-ref/source/monspeak.cc at line 586 [4.1558496]

B:BD[3.10039] → [3.10039:10093]

                                no_foe_name, no_god);

[3.10039]

[4.1567092]

                                no_foe_name, no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 640 [4.1558496]

B:BD[3.10171] → [3.10171:10244]

                                no_player, no_foe, no_foe_name, no_god);

[3.10171]

[6.10300]

                                no_player, no_foe, no_foe_name, no_god,
                                unseen);

Replacement in crawl-ref/source/monspeak.cc at line 664 [4.1558496]

B:BD[3.10394] → [3.10394:10439]

                                    no_god);

[3.10394]

[4.1571816]

                                    no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 673 [4.1558496]

B:BD[3.10586] → [3.10586:10649]

                                         no_foe_name, no_god);

[3.10586]

[6.10302]

                                         no_foe_name, no_god, unseen);

Replacement in crawl-ref/source/monspeak.cc at line 694 [4.1558496]

B:BD[3.10799] → [3.10799:10844]

                                    no_god);

[3.10799]

[4.1573812]

                                    no_god, unseen);