fiddlerwoaroof/crawl - Change BYRUSOCOJ4C3WE6JFEMYZ25ZMOXWPNGUMTBLNBWFVYPN2TW2TFPAC

Partial fix for [2628480]: use you.can_see() instead of

player_monster_visible() in monsters::name() and do_mon_str_replacements(), so that noninvisible monsters which shout when out of sight are handled correctly. This isn't really the bug that's there, but it needed to be done sometime. Note that this is a change: if a monster is too far away to see and you want to get its name, you'll have to set force_vis. I hope this doesn't break anything. Also, make the mgrd-out-of-sync message trigger outside of DEBUG_DIAGNOSTICS.

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

Created by haranp on February 24, 2009

BYRUSOCOJ4C3WE6JFEMYZ25ZMOXWPNGUMTBLNBWFVYPN2TW2TFPAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 1266 [6.16817]
B:BD[5.296] → [5.296:321]
```
#ifdef DEBUG_DIAGNOSTICS
```
Deletion in crawl-ref/source/view.cc at line 1273 [6.16817]
∅:D[7.3176] → [5.676:683]
B:BD[5.676] → [5.676:683]
```
#endif
```

Replacement in crawl-ref/source/mstuff2.cc at line 1556 [6.1340842]

∅:D[8.2865] → [9.223:280]

B:BD[10.690] → [9.223:280]

                    << (player_monster_visible(monster)?

[8.2865]

[8.2866]

                    << (you.can_see(monster)?

Replacement in crawl-ref/source/monstuff.cc at line 601 [6.1396662]

B:BD[11.3806] → [12.2590:2683]

        || !mons_near(monster)
        || !player_monster_visible(monster) // for simplicity

[11.3806]

        || !you.can_see(monster) // for simplicity

Replacement in crawl-ref/source/monstuff.cc at line 5716 [6.1396662]
∅:D[13.9133] → [14.19333:19382]
B:BD[15.3606] → [14.19333:19382]
```
            if (player_monster_visible(monster))
```
[13.9133]
[16.4919]
```
            if (you.can_see(monster))
```

Replacement in crawl-ref/source/mon-util.cc at line 1967 [6.1699344]

B:BD[17.7714] → [3.2945:3027]

    if (!force_seen && !player_monster_visible(&mon)
        && !arena_submerged)

[17.7714]

[18.11257]

    if (!force_seen && !you.can_see(&mon) && !arena_submerged)

Deletion in crawl-ref/source/mon-util.cc at line 8308 [6.1699344]

B:BD[19.11818] → [19.11818:11956]

    const monsters* m_foe = (foe && foe->atype() == ACT_MONSTER) ?
                            dynamic_cast<const monsters*>(foe) : NULL;

Replacement in crawl-ref/source/mon-util.cc at line 8341 [6.1699344]

B:BD[19.12784] → [19.12784:12837]

        if (you.can_see(m_foe) || crawl_state.arena)

[19.12784]

[19.12837]

        const monsters* m_foe = dynamic_cast<const monsters*>(foe);
        if (you.can_see(foe) || crawl_state.arena)

Replacement in crawl-ref/source/mon-util.cc at line 8348 [6.1699344]

B:BD[19.12996] → [19.12996:13053]

                foe_name = m_foe->name(DESC_NOCAP_YOUR);

[19.12996]

[19.13053]

                foe_name = foe->name(DESC_NOCAP_YOUR);

Replacement in crawl-ref/source/mon-util.cc at line 8351 [6.1699344]

B:BD[19.13084] → [19.13084:13140]

                foe_name = m_foe->name(DESC_NOCAP_THE);

[19.13084]

[19.13140]

                foe_name = foe->name(DESC_NOCAP_THE);

Replacement in crawl-ref/source/mon-util.cc at line 8369 [6.1699344]

B:BD[19.13520] → [19.13520:13631]

            msg = replace_all(msg, "@foe_name@",
                              m_foe->name(DESC_PLAIN, true));

[19.13520]

[19.13631]

            msg = replace_all(msg, "@foe_name@", foe->name(DESC_PLAIN, true));

Replacement in crawl-ref/source/mon-util.cc at line 8376 [6.1699344]

B:BD[19.13822] → [19.13822:13946]

        std::string genus = mons_type_name(mons_genus(m_foe->type),
                                           DESC_PLAIN);

[19.13822]

[19.13946]

        std::string genus = mons_type_name(mons_genus(m_foe->type), DESC_PLAIN);

Replacement in crawl-ref/source/mon-util.cc at line 8386 [6.1699344]

B:BD[20.19177] → [21.7521:7585]

    if (monster->is_named() && player_monster_visible(monster))

[20.19177]

[21.7585]

    if (monster->is_named() && you.can_see(monster))

Replacement in crawl-ref/source/mon-util.cc at line 8398 [6.1699344]
∅:D[22.6084] → [23.9968:10017]
B:BD[23.9968] → [23.9968:10017]
```
             && player_monster_visible(monster))
```
[22.6084]
[20.19255]
```
             && you.can_see(monster))
```
Deletion in crawl-ref/source/mon-util.cc at line 8430 [6.1699344]
B:BD[20.20605] → [20.20605:20606]
Replacement in crawl-ref/source/mon-util.cc at line 8431 [6.1699344]
B:BD[20.20667] → [20.20667:20708]
```
    if (player_monster_visible(monster))
```
[20.20667]
[20.20708]
```
    if (you.can_see(monster))
```

Replacement in crawl-ref/source/directn.cc at line 270 [6.3697945]

B:BD[24.1293] → [24.1293:1346]

            glych  = get_screen_glyph(pos.x, pos.y);

[24.1293]

[24.1346]

            glych  = get_screen_glyph(pos);

Replacement in crawl-ref/source/directn.cc at line 416 [6.3697945]
∅:D[25.7607] → [26.4442:4529]
B:BD[27.20906] → [26.4442:4529]
```
        if (!mons_near(montarget)
            || !player_monster_visible( montarget ))
```
[25.7607]
[27.20993]
```
        if (!you.can_see(montarget))
```
Deletion in crawl-ref/source/directn.cc at line 419 [6.3697945]
B:BD[27.21038] → [27.21038:21039]
Deletion in crawl-ref/source/directn.cc at line 420 [6.3697945]
∅:D[2.3497] → [27.21106:21107]
B:BD[27.21106] → [27.21106:21107]
Replacement in crawl-ref/source/beam.cc at line 3497 [6.4128068]
B:BD[28.37177] → [28.37177:37223]
```
            if (!player_monster_visible(mon))
```
[28.37177]
[28.37223]
```
            if (!you.can_see(mon))
```

Replacement in crawl-ref/source/beam.cc at line 4182 [6.4128068]

∅:D[29.3115] → [28.50198:50275]

B:BD[28.50198] → [28.50198:50275]

            set_attack_conducts(conducts, mon, player_monster_visible(mon));

[29.3115]

[30.9708]

            set_attack_conducts(conducts, mon, you.can_see(mon));

Replacement in crawl-ref/source/beam.cc at line 4449 [6.4128068]
B:BD[31.2792] → [32.3168:3214]
```
                (!player_monster_visible(mon)
```
[31.2792]
[28.57507]
```
                (!you.can_see(mon)
```
Replacement in crawl-ref/source/beam.cc at line 4503 [6.4128068]
∅:D[33.5251] → [28.58130:58173]
B:BD[34.14042] → [28.58130:58173]
```
             player_monster_visible(mon) ?
```
[33.5251]
[35.8779]
```
             you.can_see(mon) ?
```

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

B:BD[36.25167] → [4.15784:15834]

                if (!player_monster_visible(mon))

[36.25167]

[37.4130]

                if (!you.can_see(mon))

Partial fix for [2628480]: use you.can_see() instead of

Dependencies

In channels

Change contents

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

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

Replacement in crawl-ref/source/mstuff2.cc at line 1556 [6.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 601 [6.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5716 [6.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 1967 [6.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 8308 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8341 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8348 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8351 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8369 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8376 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8386 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8398 [6.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 8430 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 8431 [6.1699344]

Replacement in crawl-ref/source/directn.cc at line 270 [6.3697945]

Replacement in crawl-ref/source/directn.cc at line 416 [6.3697945]

Deletion in crawl-ref/source/directn.cc at line 419 [6.3697945]

Deletion in crawl-ref/source/directn.cc at line 420 [6.3697945]

Replacement in crawl-ref/source/beam.cc at line 3497 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4182 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4449 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4503 [6.4128068]

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