fiddlerwoaroof/crawl - Change XVOIH3IL5BCFZHWPXDHOMFPXFSC2WGASR7A36SOM7H7N2OAZXJHAC

Fix bug [2874237] monster info display corruption

Examining monsters with ctrl-X can lead to message corruption if the title and body fields of the describe_info struct used by process_description take up lines than fit in the message area.

This patch avoid the problem by allowing process_description to print just the title field if title + body would take up too many lines.

Also make view_desc_proc start one line later since it seemed to be trying to print the first line it was given one line above where it should have been.

Created by Charles Otto on October 31, 2009

XVOIH3IL5BCFZHWPXDHOMFPXFSC2WGASR7A36SOM7H7N2OAZXJHAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/directn.cc at line 459 [3.3697945]

[2.6782]

    view_desc_proc()
    {
        // This thing seems to be starting off 1 line above where it
        // should be. -cao
        nextline();
    }

Replacement in crawl-ref/source/describe.h at line 139 [3.3734214]

B:BD[4.9540] → [4.9540:9567]

B:BD[4.9567] → [2.9175:9206]

∅:D[2.9206] → [4.9597:9683]

B:BD[4.9597] → [4.9597:9683]

    if (inf.title.empty())
        desc = inf.body.str();
    else
    {
        desc = inf.title + "$$";
        desc += inf.body.str();
    }

[4.9540]

[4.9683]

    // How mnay lines is the title, we also seem to be adding 1 to
    // start with.
    int num_lines = count_desc_lines(inf.title, line_width) + 1;

Replacement in crawl-ref/source/describe.h at line 143 [3.3734214]

B:BD[4.9684] → [4.9684:9745]

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

[4.9684]

[4.9745]

    int body_lines   = count_desc_lines(inf.body.str(), line_width);

Insertion in crawl-ref/source/describe.h at line 149 [3.3734214]

[4.10088]

[5.99118]


    // Maybe skip the body if body + title would be too many lines
    if(inf.title.empty())
    {
        desc = inf.body.str();
        // There is a default 1 line addition for some reason
        num_lines = body_lines + 1;
    }
    else if(body_lines + num_lines + 2 <= height)
    {
        desc = inf.title + "$$";
        desc += inf.body.str();
        // Got 2 lines from the two $s that weren't counted yet
        num_lines += body_lines + 2;
    }
    else
        desc = inf.title + "$";