fiddlerwoaroof/crawl - Change F2YWDQUXULLS2WKLVMNEJKEGSGG2MPEREVI2RKH7ROS2YYKKMXHAC

FR 1971056: In the monster pane list use a monster's full name, like "rat

zombie", unless there's too many monsters to fit into the pane, in which case revert to using a monster's type name ("small zombie") so that different monsters of the same type will be shown on the same line ("2 rat zombies" + "3 kobold zombies" becomes "5 small zombies").

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

Created by zelgadis on June 8, 2008

F2YWDQUXULLS2WKLVMNEJKEGSGG2MPEREVI2RKH7ROS2YYKKMXHAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/output.cc at line 1209 [5.1088282]
[4.3808]
[4.3808]
```
        m_fullname = true;
```
Replacement in crawl-ref/source/output.cc at line 1215 [5.1088282]
B:BD[4.3889] → [4.3889:3916]
```
    const monsters* m_mon;
```
[4.3889]
[4.3916]
```
    const monsters*   m_mon;
```

Replacement in crawl-ref/source/output.cc at line 1217 [5.1088282]

B:BD[4.3950] → [4.3950:3990]

    int m_difficulty;
    int m_brands;

[4.3950]

[4.3990]

    int               m_difficulty;
    int               m_brands;
    bool              m_fullname;

Insertion in crawl-ref/source/output.cc at line 1247 [5.1088282]

[4.4624]

[2.2527]

    if (m1.m_fullname && m2.m_fullname)
        return (m1.m_mon->name(DESC_PLAIN) < m1.m_mon->name(DESC_PLAIN));

Replacement in crawl-ref/source/output.cc at line 1268 [5.1088282]

B:BD[4.5019] → [2.2578:2634]

        out << mons_type_name(m_mon->type, DESC_PLAIN);

[4.5019]

[4.5075]

        if (m_fullname)
            out << m_mon->name(DESC_PLAIN);
        else
            out << mons_type_name(m_mon->type, DESC_PLAIN);

Replacement in crawl-ref/source/output.cc at line 1275 [5.1088282]

B:BD[4.5096] → [4.5096:5191]

        out << count << " "
            << pluralise(mons_type_name(m_mon->type, DESC_PLAIN));

[4.5096]

[4.5191]

        if (m_fullname)
            out << count << " "
                << pluralise(m_mon->name(DESC_PLAIN));
        else
            out << count << " "
                << pluralise(mons_type_name(m_mon->type, DESC_PLAIN));

Deletion in crawl-ref/source/output.cc at line 1442 [5.1088282]
B:BD[3.2567] → [3.2567:2599]
```
#if BOTTOM_JUSTIFY_MONSTER_LIST
```

Insertion in crawl-ref/source/output.cc at line 1447 [5.1088282]

[3.2837]


    if (lines_needed > (unsigned int) max_print)
    {
        // Use type names rather than full names ("small zombie" vs
        // "rat zobmie") in order to take up less lines.
        for (unsigned int i=1; i < mons.size(); i++)
            mons[i].m_fullname = false;
        std::sort(mons.begin(), mons.end(), monster_pane_info::less_than);
        lines_needed = mons.size();
        for (unsigned int i=1; i < mons.size(); i++)
            if (! monster_pane_info::less_than(mons[i-1], mons[i]))
                -- lines_needed;
    }        
#if BOTTOM_JUSTIFY_MONSTER_LIST