fiddlerwoaroof/crawl - Change XKSYV5QUG2PET6BNBZPNI4D7LDBJGWOH335OD3J24AKJWE63J3WQC

Mousing over monsters, items, and features will now show their description in the message window. This inadvertantly fixes [2469950], where some lines would appear off screen.

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

Created by ennewalker on February 11, 2009

XKSYV5QUG2PET6BNBZPNI4D7LDBJGWOH335OD3J24AKJWE63J3WQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 727 [10.19415]
[9.884]
[9.884]
```
            {
```

Insertion in crawl-ref/source/tilesdl.cc at line 729 [10.19415]

[9.938]

                m_region_msg->alt_text().clear();
            }
            // TODO enne - need to find a better time to decide when
            // to generate a tip or some way to say "yes, but unchanged".
            if (ticks > m_last_tick_moved)
            {
                m_region_msg->alt_text().clear();
                for (unsigned int i = 0; 
                    i < m_layers[m_active_layer].m_regions.size(); i++)
                {
                    Region *reg = m_layers[m_active_layer].m_regions[i];
                    if (!reg->inside(m_mouse.x, m_mouse.y))
                        continue;
                    if (reg->update_alt_text(m_region_msg->alt_text()))
                        break;
                }
            }

Insertion in crawl-ref/source/tilesdl.cc at line 753 [10.19415]

[10.32053]

                m_region_tile->place_cursor(CURSOR_MOUSE, Region::NO_CURSOR);

Replacement in crawl-ref/source/tilesdl.cc at line 942 [10.19415]

B:BD[11.2807] → [11.2807:2901]

        crawl_view.msgsz.x = m_region_msg->mx;
        crawl_view.msgsz.y = m_region_msg->my;

[11.2807]

[11.2901]

        m_region_msg->ex = m_region_tile->ex;

Replacement in crawl-ref/source/tilesdl.cc at line 946 [10.19415]

B:BD[11.2922] → [11.2922:3046]

        m_region_msg->resize_to_fit(m_region_msg->wx,
                                    m_windowsz.y - m_region_msg->sx);

[11.2922]

[11.3046]

        m_region_msg->resize_to_fit(m_region_tile->wx,
                                    m_windowsz.y - m_region_msg->sy);

Insertion in crawl-ref/source/tilesdl.cc at line 950 [10.19415]

[11.3178]


        m_region_msg->ex = m_region_tile->ex;
        m_region_msg->ey = m_windowsz.y;

Insertion in crawl-ref/source/tilesdl.cc at line 955 [10.19415]

[11.3232]

    crawl_view.msgsz.x = m_region_msg->mx;
    crawl_view.msgsz.y = m_region_msg->my;

Insertion in crawl-ref/source/tilesdl.cc at line 1148 [10.19415]
[12.2371]
[12.2371]

Replacement in crawl-ref/source/tilesdl.cc at line 1150 [10.19415]

B:BD[12.2444] → [12.2444:2550]

                            min_pos, m_windowsz, WHITE, false, 150,
                            BLUE, 5);

[12.2444]

[10.38526]

                            min_pos, m_windowsz, WHITE, false, 220, BLUE, 5);

Insertion in crawl-ref/source/tilereg.h at line 53 [10.45514]
[10.46647]
[10.46647]
```
    virtual bool update_alt_text(std::string &alt) { return false; }
```
Insertion in crawl-ref/source/tilereg.h at line 171 [10.45514]
[10.49388]
[11.6208]
```
    std::string &alt_text() { return m_alt_text; }
```
Insertion in crawl-ref/source/tilereg.h at line 174 [10.45514]
[11.6219]
[11.6219]
```
    std::string m_alt_text;
```
Insertion in crawl-ref/source/tilereg.h at line 263 [10.45514]
[10.50538]
[10.50538]
```
    virtual bool update_alt_text(std::string &alt);
```
Insertion in crawl-ref/source/tilereg.h at line 346 [10.45514]
[10.52827]
[10.52827]
```
    virtual bool update_alt_text(std::string &alt);
```

Insertion in crawl-ref/source/tilereg.cc at line 1050 [10.54399]

[10.87706]

    }
    return true;
}
class alt_desc_proc
{
public:
    alt_desc_proc(int _w, int _h) { w = _w; h = _h; }
    int width() { return w; }
    int height() { return h; }
    void nextline()
    {
        ostr << "\n";
    }
    void print(const std::string &str)
    {
        ostr << str;
    }
    static int count_newlines(const std::string &str)
    {
        int count = 0;
        for (size_t i = 0; i < str.size(); i++)
        {
            if (str[i] == '\n')
                count++;
        }
        return count;
    }
    // Remove trailing newlines.
    static void trim(std::string &str)
    {
        int idx = str.size();
        while (--idx >= 0)
        {
            if (str[idx] != '\n')
                break;
        }
        str.resize(idx + 1);
    }
    // rfind consecutive newlines and truncate.
    static bool chop(std::string &str)
    {
        int loc = -1;
        for (size_t i = 1; i < str.size(); i++)
        {
            if (str[i] == '\n' && str[i-1] == '\n')
                loc = i;
        }
        if (loc == -1)
            return false;
        str.resize(loc);
        return true;
    }
    void get_string(std::string &str)
    {
        str = replace_all(ostr.str(), "\n\n\n\n", "\n\n");
        str = replace_all(str, "\n\n\n", "\n\n");
        trim(str);
        while (count_newlines(str) > h)
        {
            if (!chop(str))
                break;
        }
    }
protected:
    int w;
    int h;
    std::ostringstream ostr;
};
bool DungeonRegion::update_alt_text(std::string &alt)
{
    if (mouse_control::current_mode() != MOUSE_MODE_COMMAND)
        return false;
    const coord_def &gc = m_cursor[CURSOR_MOUSE];
    if (gc == NO_CURSOR)
        return false;
    if (!map_bounds(gc))
        return false;
    if (!see_grid(gc))
        return false;
    describe_info inf;
    get_square_desc(gc, inf);
    alt_desc_proc proc(crawl_view.msgsz.x, crawl_view.msgsz.y);
    process_description<alt_desc_proc>(proc, inf);
    proc.get_string(alt);
    // Suppress floor description
    if (alt == "Floor.")
    {
        alt.clear();
        return false;

Replacement in crawl-ref/source/tilereg.cc at line 1303 [10.54399]

B:BD[13.1746] → [6.3736:3776]

∅:D[6.3776] → [14.370:418]

B:BD[14.370] → [14.370:418]

        m_tag_font->render_string(x, y,
                                  desc.c_str(),

[13.1746]

[15.992]

        m_tag_font->render_string(x, y, desc.c_str(),

Insertion in crawl-ref/source/tilereg.cc at line 1799 [10.54399]
[10.105442]
[16.2301]
```
    }
```

Replacement in crawl-ref/source/tilereg.cc at line 1801 [10.54399]

∅:D[16.2302] → [10.105451:105457]

B:BD[10.105451] → [10.105451:105457]

[16.2302]

[10.105457]

    return true;
}
bool InventoryRegion::update_alt_text(std::string &alt)
{
    if (m_cursor == NO_CURSOR)
        return false;
    unsigned int item_idx = cursor_index();
    if (item_idx >= m_items.size() || m_items[item_idx].empty())
        return false;
    int idx = m_items[item_idx].idx;
    const item_def *item;
    if (m_items[item_idx].flag & TILEI_FLAG_FLOOR)
        item = &mitm[idx];
    else
        item = &you.inv[idx];
    describe_info inf;
    get_item_desc(*item, inf);
    alt_desc_proc proc(crawl_view.msgsz.x, crawl_view.msgsz.y);
    process_description<alt_desc_proc>(proc, inf);

Insertion in crawl-ref/source/tilereg.cc at line 1827 [10.54399]
[10.105458]
[10.105458]
```
    proc.get_string(alt);
```

Insertion in crawl-ref/source/tilereg.cc at line 2392 [10.54399]

[17.1922]

[18.390]


    if (!m_overlay && !m_alt_text.empty())
    {
        coord_def min_pos(sx, sy);
        coord_def max_pos(ex, ey);
        m_font->render_string(sx + ox, sy + oy, m_alt_text.c_str(),
                              min_pos, max_pos, WHITE, false);
        return;
    }

Deletion in crawl-ref/source/tilereg.cc at line 2435 [10.54399]

B:BD[11.7292] → [11.7292:7323]

B:BD[11.7323] → [6.4980:5020]

∅:D[6.5020] → [11.7372:7786]

B:BD[11.7372] → [11.7372:7786]

            box_vert verts[4];
            for (int i = 0; i < 4; i++)
            {
                verts[i].r = 100;
                verts[i].g = 100;
                verts[i].b = 100;
                verts[i].a = 100;
            }
            verts[0].x = sx;
            verts[0].y = sy;
            verts[1].x = sx;
            verts[1].y = sy + height;
            verts[2].x = ex;
            verts[2].y = sy + height;
            verts[3].x = ex;
            verts[3].y = sy;

Deletion in crawl-ref/source/tilereg.cc at line 2437 [10.54399]

B:BD[11.7817] → [11.7817:7995]


            GLState state;
            state.array_vertex = true;
            state.array_colour = true;
            state.blend = true;
            GLStateManager::set(state);

Replacement in crawl-ref/source/tilereg.cc at line 2438 [10.54399]

B:BD[11.7996] → [11.7996:8149]

B:BD[11.8149] → [16.2321:2394]

            glVertexPointer(2, GL_FLOAT, sizeof(box_vert), &verts[0].x);
            glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(box_vert), &verts[0].r);
            glDrawArrays(GL_QUADS, 0, sizeof(verts) / sizeof(box_vert));

[11.7996]

[11.8223]

            ShapeBuffer buff;
            VColour col(100, 100, 100, 100);
            buff.add(sx, sy, ex, sy + height, col);
            buff.draw();

Insertion in crawl-ref/source/directn.h at line 13 [19.3696722]
[19.3696987]
[19.3696987]
```
#include "describe.h"
```
Insertion in crawl-ref/source/directn.h at line 180 [19.3696722]
[20.9461]
[21.5129]
```
void get_square_desc(const coord_def &c, describe_info &inf);
```

Insertion in crawl-ref/source/directn.cc at line 1659 [19.3697945]

[22.4265]

[20.9783]

}
void get_square_desc(const coord_def &c, describe_info &inf)
{
    // NOTE: Keep this function in sync with full_describe_square.
    // Don't give out information for things outside LOS
    if (!see_grid(c.x, c.y))
        return;
    const int mid = mgrd(c);
    const int oid = igrd(c);
    if (mid != NON_MONSTER && player_monster_visible(&menv[mid]))
    {
        // First priority: monsters.
        get_monster_desc(menv[mid], inf);
    }
    else if (oid != NON_ITEM)
    {
        // Second priority: objects.
        get_item_desc(mitm[oid], inf);
    }
    else
    {
        // Third priority: features.
        get_feature_desc(c, inf);
    }

Insertion in crawl-ref/source/directn.cc at line 1691 [19.3697945]
[20.9834]
[20.9834]
```
    // NOTE: Keep this function in sync with get_square_desc.
```
Insertion in crawl-ref/source/describe.h at line 14 [19.3734214]
[19.3734654]
[19.3734654]
```
#include <sstream>
```

Insertion in crawl-ref/source/describe.h at line 29 [19.3734214]

[23.99037]

};
struct describe_info
{
    std::ostringstream body;
    std::string title;
    std::string prefix;
    std::string suffix;
    std::string footer;
    std::string quote;

Insertion in crawl-ref/source/describe.h at line 67 [19.3734214]
[24.940]
[19.3735579]
```
void get_feature_desc(const coord_def &gc, describe_info &inf);
```

Replacement in crawl-ref/source/describe.h at line 79 [19.3734214]

B:BD[19.3735801] → [25.391:458]

B:BD[25.458] → [26.3093:3151]

void describe_item( item_def &item, bool allow_inscribe = false );
void inscribe_item( item_def &item, bool proper_prompt );

[19.3735801]

[27.2566]

void describe_item(item_def &item, bool allow_inscribe = false);
void get_item_desc(const item_def &item, describe_info &inf);
void inscribe_item(item_def &item, bool proper_prompt);

Insertion in crawl-ref/source/describe.h at line 95 [19.3734214]
[28.3124]
[19.3736125]
```
void get_monster_desc(const monsters &item, describe_info &inf);
```

Replacement in crawl-ref/source/describe.h at line 113 [19.3734214]

B:BD[29.424] → [30.2678:2861]

B:BD[30.2861] → [31.3132:3241]

void print_description(const std::string &d, const std::string title = "",
                       const std::string suffix = "",
                       const std::string prefix = "",
                       const std::string footer = "",
                       const std::string quote  = "");

[29.424]

[32.982806]

void print_description(const std::string &desc);
void print_description(const describe_info &inf);
template<class T> void process_description(T &proc, const describe_info &inf);

Insertion in crawl-ref/source/describe.h at line 125 [19.3734214]

[33.2914]

[23.99118]


int count_desc_lines(const std::string _desc, const int width);
/* ***********************************************************************
 * template implementations
 * *********************************************************************** */
// My kingdom for a closure.
template<class T>
inline void process_description(T &proc, const describe_info &inf)
{
    const unsigned int line_width = proc.width();
    const          int height    = proc.height();
    std::string desc;
    if (inf.title.empty())
       desc = inf.body.str();
    else
    {
        desc = inf.title + "$$";
        desc += inf.body.str();
    }
    int num_lines = count_desc_lines(desc, line_width) + 1;
    const int suffix_lines = count_desc_lines(inf.suffix, line_width);
    const int prefix_lines = count_desc_lines(inf.prefix, line_width);
    const int footer_lines = count_desc_lines(inf.footer, line_width)
                             + (inf.footer.empty() ? 0 : 1);
    const int quote_lines  = count_desc_lines(inf.quote, line_width);

Insertion in crawl-ref/source/describe.h at line 156 [19.3734214]

[23.99119]

[19.3736372]

    // Prefer the footer over the suffix.
    if (num_lines + suffix_lines + footer_lines <= height)
    {
        desc = desc + inf.suffix;
        num_lines += suffix_lines;
    }
    // Prefer the footer over the prefix.
    if (num_lines + prefix_lines + footer_lines <= height)
    {
        desc = inf.prefix + desc;
        num_lines += prefix_lines;
    }
    // Prefer the footer over the quote.
    if (num_lines + footer_lines + quote_lines + 1 <= height)
    {
        if (!desc.empty())
        {
            desc += "$";
            num_lines++;
        }
        desc = desc + inf.quote;
        num_lines += quote_lines;
    }
    if (!inf.footer.empty() && num_lines + footer_lines <= height)
    {
        const int bottom_line = std::min(std::max(24, num_lines + 2),
                                         height - footer_lines + 1);
        const int newlines = bottom_line - num_lines;
        if (newlines >= 0)
        {
            desc.append(newlines, '\n');
            desc = desc + inf.footer;
        }
    }
    std::string::size_type nextLine = std::string::npos;
    unsigned int  currentPos = 0;
    while (currentPos < desc.length())
    {
        if (currentPos != 0)
            proc.nextline();
        // See if $ sign is within one line_width.
        nextLine = desc.find('$', currentPos);
        if (nextLine >= currentPos && nextLine < currentPos + line_width)
        {
            proc.print(desc.substr(currentPos, nextLine-currentPos));
            currentPos = nextLine + 1;
            continue;
        }
        // Handle real line breaks.  No substitutions necessary, just update
        // the counts.
        nextLine = desc.find('\n', currentPos);
        if (nextLine >= currentPos && nextLine < currentPos + line_width)
        {
            proc.print(desc.substr(currentPos, nextLine-currentPos));
            currentPos = nextLine + 1;
            continue;
        }
        // No newline -- see if rest of string will fit.
        if (currentPos + line_width >= desc.length())
        {
            proc.print(desc.substr(currentPos));
            return;
        }
        // Ok, try to truncate at space.
        nextLine = desc.rfind(' ', currentPos + line_width);
        if (nextLine > 0)
        {
            proc.print(desc.substr(currentPos, nextLine - currentPos));
            currentPos = nextLine + 1;
            continue;
        }
        // Oops.  Just truncate.
        nextLine = currentPos + line_width;
        nextLine = std::min(inf.body.str().length(), nextLine);
        proc.print(desc.substr(currentPos, nextLine - currentPos));
        currentPos = nextLine;
    }
}

Replacement in crawl-ref/source/describe.cc at line 82 [19.3736416]

B:BD[30.2919] → [30.2919:2990]

static int _count_desc_lines(const std::string _desc, const int width)

[30.2919]

[30.2990]

int count_desc_lines(const std::string _desc, const int width)

Deletion in crawl-ref/source/describe.cc at line 107 [19.3736416]

B:BD[19.3738721] → [30.3243:3388]

B:BD[30.3388] → [31.3243:3317]

∅:D[29.521] → [19.3738775:3738777]

∅:D[31.3317] → [19.3738775:3738777]

∅:D[30.3437] → [19.3738775:3738777]

B:BD[19.3738775] → [19.3738775:3738777]

B:BD[19.3738777] → [30.3438:3691]

void print_description(const std::string &d, const std::string title,
                       const std::string suffix, const std::string prefix,
                       const std::string footer, const std::string quote)
{
    const unsigned int lineWidth = get_number_of_cols()  - 1;
    const          int height    = get_number_of_lines();
    std::string desc;
    if (title.empty())
       desc = d;
    else
    {
        desc = title + "$$";
        desc += d;
    }

Replacement in crawl-ref/source/describe.cc at line 108 [19.3736416]

B:BD[30.3692] → [30.3692:4010]

B:BD[30.4010] → [31.3318:3384]

∅:D[31.3384] → [30.4010:4011]

B:BD[30.4010] → [30.4010:4011]

B:BD[30.4011] → [31.3385:3427]

∅:D[31.3427] → [30.4052:4189]

B:BD[30.4052] → [30.4052:4189]

B:BD[30.4189] → [31.3428:3470]

∅:D[31.3470] → [30.4230:4366]

B:BD[30.4230] → [30.4230:4366]

    int num_lines = _count_desc_lines(desc, lineWidth) + 1;
    const int suffix_lines = _count_desc_lines(suffix, lineWidth);
    const int prefix_lines = _count_desc_lines(prefix, lineWidth);
    const int footer_lines = _count_desc_lines(footer, lineWidth)
                             + (footer.empty() ? 0 : 1);
    const int quote_lines  = _count_desc_lines(quote, lineWidth);
    // Prefer the footer over the suffix.
    if (num_lines + suffix_lines + footer_lines <= height)
    {
        desc = desc + suffix;
        num_lines += suffix_lines;
    }
    // Prefer the footer over the prefix.
    if (num_lines + prefix_lines + footer_lines <= height)
    {
        desc = prefix + desc;
        num_lines += prefix_lines;
    }

[30.3692]

[30.4366]

void print_description(const std::string &body)
{
    describe_info inf;
    inf.body << body;
    print_description(inf);
}

Replacement in crawl-ref/source/describe.cc at line 115 [19.3736416]

B:BD[30.4367] → [31.3471:3746]

    // Prefer the footer over the quote.
    if (num_lines + footer_lines + quote_lines + 1 <= height)
    {
        if (!desc.empty())
        {
            desc += "$";
            num_lines++;
        }
        desc = desc + quote;
        num_lines += quote_lines;
    }

[30.4367]

[31.3746]

class default_desc_proc
{
public:
    int width() { return get_number_of_cols() - 1; }
    int height() { return get_number_of_lines(); }
    void print(const std::string &str) { cprintf("%s", str.c_str()); }
    void nextline() { cgotoxy(1, wherey() + 1); }
};

Replacement in crawl-ref/source/describe.cc at line 124 [19.3736416]

∅:D[31.3747] → [30.4367:4759]

B:BD[30.4367] → [30.4367:4759]

∅:D[30.4759] → [34.545:602]

B:BD[19.3738777] → [34.545:602]

∅:D[34.602] → [19.3738825:3738859]

B:BD[19.3738825] → [19.3738825:3738859]

∅:D[35.16227] → [19.3739009:3739010]

B:BD[19.3739009] → [19.3739009:3739010]

    if (!footer.empty() && num_lines + footer_lines <= height)
    {
        const int bottom_line = std::min(std::max(24, num_lines + 2),
                                         height - footer_lines + 1);
        const int newlines = bottom_line - num_lines;
        if (newlines >= 0)
        {
            desc.append(newlines, '\n');
            desc = desc + footer;
        }
    }
    std::string::size_type nextLine = std::string::npos;
    unsigned int  currentPos = 0;

[31.3747]

[30.4760]

void print_description(const describe_info &inf)
{

Deletion in crawl-ref/source/describe.cc at line 128 [19.3736416]
B:BD[19.3739036] → [19.3739036:3739037]
B:BD[19.3739037] → [30.4775:4814]
∅:D[30.4814] → [19.3739072:3739107]
∅:D[36.28363] → [19.3739072:3739107]
B:BD[19.3739072] → [19.3739072:3739107]
B:BD[19.3739107] → [37.7773:7811]
```
    while (currentPos < desc.length())
    {
        if (currentPos != 0)
            cgotoxy(1, wherey() + 1);
```

Replacement in crawl-ref/source/describe.cc at line 129 [19.3736416]

B:BD[19.3739239] → [31.3748:3798]

∅:D[31.3798] → [30.4815:4862]

B:BD[19.3739288] → [30.4815:4862]

∅:D[38.331] → [19.3739368:3739369]

∅:D[30.4862] → [19.3739368:3739369]

B:BD[19.3739368] → [19.3739368:3739369]

B:BD[19.3739369] → [38.332:415]

B:BD[38.415] → [30.4863:4966]

∅:D[30.4966] → [38.495:556]

B:BD[38.495] → [38.495:556]

∅:D[38.556] → [19.3739757:3739767]

B:BD[19.3739757] → [19.3739757:3739767]

B:BD[19.3739767] → [39.2812:2813]

∅:D[39.2813] → [38.566:666]

B:BD[38.566] → [38.566:666]

B:BD[38.666] → [30.4967:5015]

∅:D[30.5015] → [38.711:794]

B:BD[38.711] → [38.711:794]

B:BD[38.794] → [30.5016:5119]

∅:D[30.5119] → [40.2679:2718]

B:BD[38.874] → [40.2679:2718]

∅:D[40.2718] → [38.912:934]

B:BD[38.912] → [38.912:934]

B:BD[38.934] → [39.2814:2825]

B:BD[39.2825] → [31.3799:3856]

∅:D[31.3856] → [30.5120:5173]

B:BD[19.3739825] → [30.5120:5173]

∅:D[30.5173] → [19.3739875:3739885]

B:BD[19.3739875] → [19.3739875:3739885]

B:BD[19.3739885] → [30.5174:5230]

∅:D[30.5230] → [19.3739938:3739970]

B:BD[19.3739938] → [19.3739938:3739970]

B:BD[19.3739970] → [31.3857:3898]

∅:D[31.3898] → [30.5231:5291]

B:BD[19.3740012] → [30.5231:5291]

∅:D[30.5291] → [19.3740069:3740106]

B:BD[19.3740069] → [19.3740069:3740106]

B:BD[19.3740106] → [30.5292:5371]

∅:D[30.5371] → [19.3740182:3740254]

B:BD[19.3740182] → [19.3740182:3740254]

B:BD[19.3740254] → [31.3899:3932]

∅:D[31.3932] → [19.3740287:3740331]

B:BD[19.3740287] → [19.3740287:3740331]

B:BD[19.3740331] → [40.2719:2770]

∅:D[40.2770] → [19.3740401:3740402]

B:BD[19.3740401] → [19.3740401:3740402]

B:BD[19.3740402] → [30.5372:5447]

∅:D[30.5447] → [19.3740474:3740505]

B:BD[19.3740474] → [19.3740474:3740505]

B:BD[19.3740505] → [41.3681:3687]

        // See if $ sign is within one lineWidth.
        nextLine = desc.find('$', currentPos);
        if (nextLine >= currentPos && nextLine < currentPos + lineWidth)
        {
            cprintf("%s",
                    (desc.substr(currentPos, nextLine-currentPos)).c_str());
            currentPos = nextLine + 1;
            continue;
        }
        // Handle real line breaks.  No substitutions necessary, just update
        // the counts.
        nextLine = desc.find('\n', currentPos);
        if (nextLine >= currentPos && nextLine < currentPos + lineWidth)
        {
            cprintf("%s",
                    (desc.substr(currentPos, nextLine-currentPos)).c_str());
            currentPos = nextLine + 1;
            continue;
        }
        // No newline -- see if rest of string will fit.
        if (currentPos + lineWidth >= desc.length())
        {
            cprintf((desc.substr(currentPos)).c_str());
            return;
        }
        // Ok, try to truncate at space.
        nextLine = desc.rfind(' ', currentPos + lineWidth);
        if (nextLine > 0)
        {
            cprintf((desc.substr(currentPos, nextLine - currentPos)).c_str());
            currentPos = nextLine + 1;
            continue;
        }
        // Oops.  Just truncate.
        nextLine = currentPos + lineWidth;
        nextLine = std::min(d.length(), nextLine);
        cprintf((desc.substr(currentPos, nextLine - currentPos)).c_str());
        currentPos = nextLine;
    }

[19.3739239]

[41.3687]

    default_desc_proc proc;    
    process_description<default_desc_proc>(proc, inf);

Replacement in crawl-ref/source/describe.cc at line 1789 [19.3736416]

B:BD[31.4260] → [31.4260:4387]

                if (_count_desc_lines(db_desc, lineWidth)
                    + _count_desc_lines(quote, lineWidth) <= height)

[31.4260]

[31.4387]

                if (count_desc_lines(db_desc, lineWidth)
                    + count_desc_lines(quote, lineWidth) <= height)

Replacement in crawl-ref/source/describe.cc at line 2011 [19.3736416]
∅:D[2.5710] → [42.13577:13612]
B:BD[43.24163] → [42.13577:13612]
```
        if (is_blood_potion(item))
```
[2.5710]
[43.24256]
```
        if (!dump && is_blood_potion(item))
```
Replacement in crawl-ref/source/describe.cc at line 2103 [19.3736416]
B:BD[24.5032] → [24.5032:5073]
```
void describe_feature_wide(int x, int y)
```
[24.5032]
[24.5073]
```
void get_feature_desc(const coord_def &pos, describe_info &inf)
```
Deletion in crawl-ref/source/describe.cc at line 2105 [19.3736416]
B:BD[24.5075] → [4.6820:6851]
```
    const coord_def pos(x, y);
```
Deletion in crawl-ref/source/describe.cc at line 2106 [19.3736416]
∅:D[4.6899] → [44.2012:2013]
B:BD[24.5143] → [44.2012:2013]
Replacement in crawl-ref/source/describe.cc at line 2107 [19.3736416]
∅:D[4.6975] → [45.6694:6720]
B:BD[44.2058] → [45.6694:6720]
B:BD[45.6720] → [4.6976:7032]
```
    std::string db_name =
        grd[x][y] == DNGN_ENTER_SHOP ? "A shop" : desc;
```
[4.6975]
[4.7032]
```
    std::string db_name = grd(pos) == DNGN_ENTER_SHOP ? "A shop" : desc;
```
Replacement in crawl-ref/source/describe.cc at line 2110 [19.3736416]
B:BD[4.7090] → [4.7090:7109]
```
    desc += ".$$";
```
[4.7090]
[4.7109]
```
    inf.body << desc << ".$$";
```
Replacement in crawl-ref/source/describe.cc at line 2153 [19.3736416]
B:BD[4.8070] → [4.8070:8093]
```
    desc += long_desc;
```
[4.8070]
[44.2125]
```
    inf.body << long_desc;
```

Replacement in crawl-ref/source/describe.cc at line 2157 [19.3736416]

B:BD[4.8116] → [4.8116:8174]

        desc += _get_feature_description_wide(grd[x][y]);

[4.8116]

[19.3844087]

        inf.body << _get_feature_description_wide(grd(pos));
    inf.quote = getQuoteString(db_name);
}

Replacement in crawl-ref/source/describe.cc at line 2162 [19.3736416]

B:BD[19.3844088] → [45.6885:6934]

    std::string quote = getQuoteString(db_name);

[19.3844088]

[45.6934]

void describe_feature_wide(int x, int y)
{
    const coord_def pos(x, y);

Replacement in crawl-ref/source/describe.cc at line 2166 [19.3736416]

B:BD[45.6935] → [45.6935:6987]

    print_description(desc, "", "", "", "", quote);

[45.6935]

[46.5935022]

    describe_info inf;
    get_feature_desc(pos, inf);
    print_description(inf);

Insertion in crawl-ref/source/describe.cc at line 2197 [19.3736416]

[19.3844089]

[47.7224]

void get_item_desc(const item_def &item, describe_info &inf)
{
    inf.body << get_item_description(item, true, false, Options.tutorial_left);
}

Replacement in crawl-ref/source/describe.cc at line 2208 [19.3736416]

B:BD[48.3062] → [48.3062:3205]

    std::string description = get_item_description( item, 1, false,
                                                   Options.tutorial_left);

[48.3062]

[48.3205]

    describe_info inf;
    std::string desc = 
        get_item_description(item, true, false, Options.tutorial_left);

Replacement in crawl-ref/source/describe.cc at line 2212 [19.3736416]

B:BD[48.3206] → [48.3206:3273]

    int num_lines = _count_desc_lines(description, lineWidth) + 1;

[48.3206]

[48.3273]

    int num_lines = count_desc_lines(desc, lineWidth) + 1;

Replacement in crawl-ref/source/describe.cc at line 2219 [19.3736416]

B:BD[48.3582] → [48.3582:3649]

        description = get_item_description( item, 1, false, true);

[48.3582]

[48.3649]

        desc = get_item_description(item, 1, false, true);

Replacement in crawl-ref/source/describe.cc at line 2221 [19.3736416]
∅:D[44.2234] → [49.475023:475059]
∅:D[48.3650] → [49.475023:475059]
B:BD[19.3844518] → [49.475023:475059]
```
    print_description(description);
```
[48.3650]
[50.2254]
```
    print_description(desc);
```
Replacement in crawl-ref/source/describe.cc at line 2712 [19.3736416]
B:BD[19.3886824] → [28.3126:3171]
```
void describe_monsters(const monsters& mons)
```
[7.9082]
[19.3886894]
```
void get_monster_desc(const monsters& mons, describe_info &inf)
```
Replacement in crawl-ref/source/describe.cc at line 2719 [19.3736416]
∅:D[51.5039] → [52.4853:4882]
B:BD[52.4853] → [52.4853:4882]
```
        describe_item(item);
```
[51.5039]
[52.4882]
```
        get_item_desc(item, inf);
```
Deletion in crawl-ref/source/describe.cc at line 2722 [19.3736416]
B:BD[52.4904] → [39.3315:3316]
B:BD[39.3316] → [53.2759:2788]
B:BD[53.2788] → [31.4558:4604]
```
    std::ostringstream body;
    std::string title, prefix, suffix, quote;
```
Replacement in crawl-ref/source/describe.cc at line 2723 [19.3736416]
B:BD[53.2828] → [3.8701:8747]
```
    title = mons.full_name(DESC_CAP_A, true);
```
[53.2828]
[52.4910]
```
    inf.title = mons.full_name(DESC_CAP_A, true);
```

Replacement in crawl-ref/source/describe.cc at line 2731 [19.3736416]

B:BD[31.4784] → [31.4784:4866]

        body << getLongDescription(db_name);
    quote = getQuoteString(db_name);

[31.4784]

[54.536]

        inf.body << getLongDescription(db_name);
    inf.quote = getQuoteString(db_name);

Replacement in crawl-ref/source/describe.cc at line 2742 [19.3736416]
B:BD[54.703] → [53.3134:3182]
```
    prefix = getLongDescription(symbol_prefix);
```
[54.703]
[55.3493]
```
    inf.prefix = getLongDescription(symbol_prefix);
```

Replacement in crawl-ref/source/describe.cc at line 2745 [19.3736416]

B:BD[31.4923] → [31.4923:5009]

    if (!quote.empty() && !quote2.empty())
        quote += "$";
    quote += quote2;

[31.4923]

[31.5009]

    if (!inf.quote.empty() && !quote2.empty())
        inf.quote += "$";
    inf.quote += quote2;

Replacement in crawl-ref/source/describe.cc at line 2759 [19.3736416]

B:BD[56.33687] → [5.2729:2775]

                body << "$It smells great!$";

[56.33687]

[57.6981]

                inf.body << "$It smells great!$";

Replacement in crawl-ref/source/describe.cc at line 2761 [19.3736416]
B:BD[57.6998] → [5.2776:2816]
```
                body << "$It stinks.$";
```
[57.6998]
[57.7043]
```
                inf.body << "$It stinks.$";
```
Replacement in crawl-ref/source/describe.cc at line 2767 [19.3736416]
B:BD[58.1292] → [5.2817:2862]
```
            body << "$It smells horrible.$";
```
[58.1292]
[19.3902530]
```
            inf.body << "$It smells horrible.$";
```

Replacement in crawl-ref/source/describe.cc at line 2776 [19.3736416]

B:BD[59.39779] → [5.2863:2919]

            body << "$It is particularly attractive.$";

[59.39779]

[59.39838]

            inf.body << "$It is particularly attractive.$";

Replacement in crawl-ref/source/describe.cc at line 2778 [19.3736416]

B:BD[59.39851] → [5.2920:2974]

            body << "$It is strange and repulsive.$";

[59.39851]

[19.3907811]

            inf.body << "$It is strange and repulsive.$";

Replacement in crawl-ref/source/describe.cc at line 2785 [19.3736416]

B:BD[19.3908392] → [5.2975:3030]

            body << "$It wants to drink your blood!$";

[19.3908392]

[19.3912955]

            inf.body << "$It wants to drink your blood!$";

Replacement in crawl-ref/source/describe.cc at line 2790 [19.3736416]

B:BD[19.3913259] → [5.3031:3084]

            body <<  "$It has come for your soul!$";

[19.3913259]

[19.3913316]

            inf.body <<  "$It has come for your soul!$";

Replacement in crawl-ref/source/describe.cc at line 2795 [19.3736416]

B:BD[60.5143] → [5.3085:3144]

        body << "$This one is remarkably plain looking.$";

[60.5143]

[61.2140]

        inf.body << "$This one is remarkably plain looking.$";

Replacement in crawl-ref/source/describe.cc at line 2815 [19.3736416]

B:BD[32.989101] → [5.3145:3198]

        body << "$" << _describe_draconian( &mons );

[32.989101]

[39.3453]

        inf.body << "$" << _describe_draconian( &mons );

Replacement in crawl-ref/source/describe.cc at line 2819 [19.3736416]

B:BD[19.3930825] → [31.5709:5786]

        body << "The apparition of " << get_ghost_description(mons) << ".$";

[19.3930825]

[19.3933030]

        inf.body << "The apparition of " << get_ghost_description(mons) << ".$";

Replacement in crawl-ref/source/describe.cc at line 2823 [19.3736416]
B:BD[19.3933079] → [53.3720:3759]
```
        body << _describe_demon(mons);
```
[19.3933079]
[19.3938087]
```
        inf.body << _describe_demon(mons);
```
Replacement in crawl-ref/source/describe.cc at line 2828 [19.3736416]
B:BD[58.1325] → [5.3199:3244]
```
            body << "$He smells terrible.$";
```
[58.1325]
[62.3508]
```
            inf.body << "$He smells terrible.$";
```

Replacement in crawl-ref/source/describe.cc at line 2832 [19.3736416]

B:BD[19.3939988] → [53.3804:3871]

        body << "If this monster is a \"program bug\", then it's "

[19.3939988]

[63.10336]

        inf.body << "If this monster is a \"program bug\", then it's "

Replacement in crawl-ref/source/describe.cc at line 2846 [19.3736416]
B:BD[7.9180] → [7.9180:9215]
```
            body << "$" << result;
```
[7.9180]
[7.9215]
```
            inf.body << "$" << result;
```

Replacement in crawl-ref/source/describe.cc at line 2851 [19.3736416]

B:BD[64.3845] → [5.3245:3319]

        body << "$" << mons_pronoun(static_cast<monster_type>(mons.type),

[64.3845]

[5.3319]

        inf.body << "$" << mons_pronoun(static_cast<monster_type>(mons.type),

Replacement in crawl-ref/source/describe.cc at line 2858 [19.3736416]

B:BD[8.2777] → [8.2777:2852]

        body << "$" << "This monster has been summoned, and is thus only "

[8.2777]

[8.2852]

        inf.body << "$" << "This monster has been summoned, and is thus only "

Replacement in crawl-ref/source/describe.cc at line 2866 [19.3736416]

B:BD[54.882] → [53.3872:3983]

    suffix += getLongDescription(symbol_suffix);
    suffix += getLongDescription(symbol_suffix + "_examine");

[54.882]

[31.5910]

    inf.suffix += getLongDescription(symbol_suffix);
    inf.suffix += getLongDescription(symbol_suffix + "_examine");

Replacement in crawl-ref/source/describe.cc at line 2870 [19.3736416]

B:BD[31.5955] → [31.5955:6041]

    if (!quote.empty() && !quote2.empty())
        quote += "$";
    quote += quote2;

[31.5955]

[54.936]

    if (!inf.quote.empty() && !quote2.empty())
        inf.quote += "$";
    inf.quote += quote2;

Replacement in crawl-ref/source/describe.cc at line 2886 [19.3736416]

B:BD[19.3941061] → [53.3984:4034]

                    body << "$$Monster Spells:$";

[19.3941061]

[19.3941117]

                    inf.body << "$$Monster Spells:$";

Replacement in crawl-ref/source/describe.cc at line 2890 [19.3736416]

B:BD[19.3941176] → [53.4035:4226]

                body << "    " << i << ": "
                     << spell_title(hspell_pass[i])
                     << " (" << static_cast<int>(hspell_pass[i])
                     << ")$";

[19.3941176]

[19.3941338]

                inf.body << "    " << i << ": "
                         << spell_title(hspell_pass[i])
                         << " (" << static_cast<int>(hspell_pass[i])
                         << ")$";

Replacement in crawl-ref/source/describe.cc at line 2905 [19.3736416]

B:BD[19.3941552] → [53.4227:4275]

                body << "$Monster Inventory:$";

[19.3941552]

[19.3941607]

                inf.body << "$Monster Inventory:$";

Replacement in crawl-ref/source/describe.cc at line 2908 [19.3736416]
B:BD[19.3941654] → [53.4276:4316]
```
            body << "    " << i << ") "
```
[19.3941654]
[53.4316]
```
            inf.body << "    " << i << ") "
```
Insertion in crawl-ref/source/describe.cc at line 2913 [19.3736416]
[19.3941987]
[60.6266]
```
}
```

Replacement in crawl-ref/source/describe.cc at line 2915 [19.3736416]

B:BD[60.6267] → [31.6042:6111]

    print_description(body.str(), title, suffix, prefix, "", quote);

[60.6267]

[46.5935151]

void describe_monsters(const monsters& mons)
{
    describe_info inf;
    get_monster_desc(mons, inf);
    print_description(inf);

Insertion in crawl-ref/source/describe.cc at line 2923 [19.3736416]

[65.15552]

    // TODO enne - this should really move into get_monster_desc
    // and an additional tutorial string added to describe_info.

Insertion in crawl-ref/source/command.cc at line 1258 [19.4082507]
[66.7067]
[31.35547]
```
    describe_info inf;
```
Replacement in crawl-ref/source/command.cc at line 1260 [19.4082507]
B:BD[31.35596] → [31.35596:35641]
∅:D[31.35641] → [30.5528:5561]
B:BD[66.7115] → [30.5528:5561]
```
    std::string quote = getQuoteString(key);
    std::string prefix, suffix;
```
[31.35596]
[30.5561]
```
    inf.quote = getQuoteString(key);
```

Replacement in crawl-ref/source/command.cc at line 1269 [19.4082507]

B:BD[67.6337] → [67.6337:6464]

            suffix = "$$" + god_name(which_god) + " won't accept worship from "
                     "undead or evil beings.";

[67.6337]

[67.6464]

            inf.suffix = "$$" + god_name(which_god) +
                         " won't accept worship from undead or evil beings.";

Replacement in crawl-ref/source/command.cc at line 1363 [19.4082507]

B:BD[30.5791] → [31.35748:35813]

    print_description(desc, key, suffix, prefix, footer, quote);

[30.5791]

[68.16941]


    inf.footer = footer;
    inf.title = key;
    print_description(inf);

Mousing over monsters, items, and features will now show their description in the message window. This inadvertantly fixes [2469950], where some lines would appear off screen.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilesdl.cc at line 727 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 729 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 753 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 942 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 946 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 950 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 955 [10.19415]

Insertion in crawl-ref/source/tilesdl.cc at line 1148 [10.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1150 [10.19415]

Insertion in crawl-ref/source/tilereg.h at line 53 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 171 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 174 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 263 [10.45514]

Insertion in crawl-ref/source/tilereg.h at line 346 [10.45514]

Insertion in crawl-ref/source/tilereg.cc at line 1050 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1303 [10.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1799 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1801 [10.54399]

Insertion in crawl-ref/source/tilereg.cc at line 1827 [10.54399]

Insertion in crawl-ref/source/tilereg.cc at line 2392 [10.54399]

Deletion in crawl-ref/source/tilereg.cc at line 2435 [10.54399]

Deletion in crawl-ref/source/tilereg.cc at line 2437 [10.54399]

Replacement in crawl-ref/source/tilereg.cc at line 2438 [10.54399]

Insertion in crawl-ref/source/directn.h at line 13 [19.3696722]

Insertion in crawl-ref/source/directn.h at line 180 [19.3696722]

Insertion in crawl-ref/source/directn.cc at line 1659 [19.3697945]

Insertion in crawl-ref/source/directn.cc at line 1691 [19.3697945]

Insertion in crawl-ref/source/describe.h at line 14 [19.3734214]

Insertion in crawl-ref/source/describe.h at line 29 [19.3734214]

Insertion in crawl-ref/source/describe.h at line 67 [19.3734214]

Replacement in crawl-ref/source/describe.h at line 79 [19.3734214]

Insertion in crawl-ref/source/describe.h at line 95 [19.3734214]

Replacement in crawl-ref/source/describe.h at line 113 [19.3734214]

Insertion in crawl-ref/source/describe.h at line 125 [19.3734214]

Insertion in crawl-ref/source/describe.h at line 156 [19.3734214]

Replacement in crawl-ref/source/describe.cc at line 82 [19.3736416]

Deletion in crawl-ref/source/describe.cc at line 107 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 108 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 115 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 124 [19.3736416]

Deletion in crawl-ref/source/describe.cc at line 128 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 129 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 1789 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2011 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2103 [19.3736416]

Deletion in crawl-ref/source/describe.cc at line 2105 [19.3736416]

Deletion in crawl-ref/source/describe.cc at line 2106 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2107 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2110 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2153 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2157 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2162 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2166 [19.3736416]

Insertion in crawl-ref/source/describe.cc at line 2197 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2208 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2212 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2219 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2221 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2712 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2719 [19.3736416]

Deletion in crawl-ref/source/describe.cc at line 2722 [19.3736416]

Replacement in crawl-ref/source/describe.cc at line 2723 [19.3736416]