fiddlerwoaroof/crawl - Change TE3QYFTQB2N6RHYG6VULGNUZ7EN6MZ5IDITC7KWD75UHPG7A2YAAC

Fix 2038651: real/fake rakshasa identity being leaked by monster pane window

and 'x' description.

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

Created by haranp on August 6, 2008

TE3QYFTQB2N6RHYG6VULGNUZ7EN6MZ5IDITC7KWD75UHPG7A2YAAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/output.cc at line 1179 [6.1088282]

[4.3815]

[5.3570]

    int mtype = m->type;
    if ( mtype == MONS_RAKSHASA_FAKE )
        mtype = MONS_RAKSHASA;

Replacement in crawl-ref/source/output.cc at line 1184 [6.1088282]

B:BD[5.3649] → [5.3649:3705]

    const monsterentry* me = get_monster_data(m->type);

[5.3649]

[3.2690]

    const monsterentry* me = get_monster_data(mtype);

Replacement in crawl-ref/source/output.cc at line 1186 [6.1088282]

∅:D[3.2768] → [5.3705:3777]

B:BD[5.3705] → [5.3705:3777]

    m_difficulty = me->hpdice[0] * (me->hpdice[1] + (me->hpdice[2]>>1))

[3.2768]

[5.3777]

    m_difficulty = me->hpdice[0] * (me->hpdice[1] + (me->hpdice[2]/2))

Insertion in crawl-ref/source/output.cc at line 1212 [6.1088282]

[2.3362]

    int m1type = m1.m_mon->type;
    int m2type = m2.m_mon->type;
    // Don't differentiate real rakshasas from fake ones.
    if ( m1type == MONS_RAKSHASA_FAKE )
        m1type = MONS_RAKSHASA;
    if ( m2type == MONS_RAKSHASA_FAKE )
        m2type = MONS_RAKSHASA;

Replacement in crawl-ref/source/output.cc at line 1223 [6.1088282]

B:BD[2.3460] → [2.3460:3658]

    if (!zombified && m1.m_mon->type >= MONS_DRACONIAN
        && m1.m_mon->type <= MONS_PALE_DRACONIAN
        && m2.m_mon->type >= MONS_DRACONIAN
        && m2.m_mon->type <= MONS_PALE_DRACONIAN)

[2.3460]

[2.3658]

    if (!zombified && m1type >= MONS_DRACONIAN
        && m1type <= MONS_PALE_DRACONIAN
        && m2type >= MONS_DRACONIAN
        && m2type <= MONS_PALE_DRACONIAN)

Replacement in crawl-ref/source/output.cc at line 1238 [6.1088282]

B:BD[7.2623] → [7.2623:2709]

    if (mons_is_mimic(m1.m_mon->type)
        && mons_is_mimic(m2.m_mon->type))
    {

[7.2623]

[7.2709]

    if (mons_is_mimic(m1type) && mons_is_mimic(m2type))

Deletion in crawl-ref/source/output.cc at line 1240 [6.1088282]
B:BD[7.2733] → [7.2733:2739]
```
    }
```
Replacement in crawl-ref/source/output.cc at line 1241 [6.1088282]
∅:D[7.2740] → [4.4493:4534]
B:BD[4.4493] → [4.4493:4534]
```
    if (m1.m_mon->type < m2.m_mon->type)
```
[7.2740]
[8.2804]
```
    if (m1type < m2type)
```
Replacement in crawl-ref/source/output.cc at line 1243 [6.1088282]
∅:D[8.2827] → [4.4555:4601]
B:BD[4.4555] → [4.4555:4601]
```
    else if (m1.m_mon->type > m2.m_mon->type)
```
[8.2827]
[7.2741]
```
    else if (m1type > m2type)
```
Replacement in crawl-ref/source/output.cc at line 1248 [6.1088282]
B:BD[7.2889] → [7.2889:2936]
```
    if (m1.m_mon->type == MONS_DANCING_WEAPON)
```
[7.2889]
[8.2828]
```
    if (m1type == MONS_DANCING_WEAPON)
```

Replacement in crawl-ref/source/output.cc at line 1269 [6.1088282]

B:BD[4.4624] → [7.2937:3016]

    if (m1.m_fullname && m2.m_fullname || m1.m_mon->type == MONS_PLAYER_GHOST)

[4.4624]

[9.2752]

    if (m1.m_fullname && m2.m_fullname || m1type == MONS_PLAYER_GHOST)

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

B:BD[10.4852] → [10.4852:4894]

    if (mon->type != MONS_DANCING_WEAPON)

[10.4852]

[11.20266]

    // We don't report rakshasa equipment in order not to give away the
    // true rakshasa when it summons.
    if (mon->type != MONS_DANCING_WEAPON
        && (mon->type != MONS_RAKSHASA || mons_friendly(mon)))
    {

Insertion in crawl-ref/source/directn.cc at line 2813 [6.3697945]
[11.20312]
[10.4939]
```
    }
```
Replacement in crawl-ref/source/directn.cc at line 2823 [6.3697945]
∅:D[12.3169] → [13.2725:2744]
B:BD[10.5046] → [13.2725:2744]
```
    if (full_desc)
```
[12.3169]
[10.5088]
```
    if (full_desc && (mon->type != MONS_RAKSHASA || mons_friendly(mon)))
```

Fix 2038651: real/fake rakshasa identity being leaked by monster pane window

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/output.cc at line 1179 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1184 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1186 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 1212 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1223 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1238 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 1240 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1241 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1243 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1248 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1269 [6.1088282]

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

Insertion in crawl-ref/source/directn.cc at line 2813 [6.3697945]

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