fiddlerwoaroof/crawl - Change T3454DDD7P4UHQZFDSNXC5DDWW3OXPPEDZ3SWNA3ZM3Y2MKX2FAQC

[2462140] Reverting previous check in to add more lines to the help menus. The better solution is to pick the text-only menu or the graphical menu in the constructor.

This fixes an issue where there's a floating '=' x 80 line on the help screen sometimes, due to the graphical and textual draw_stock_item functions being inappropriately mixed.

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

Created by ennewalker on December 24, 2008

T3454DDD7P4UHQZFDSNXC5DDWW3OXPPEDZ3SWNA3ZM3Y2MKX2FAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/menu.h at line 240 [3.255942]

B:BD[3.259378] → [4.552:625]

    Menu( int flags = MF_MULTISELECT, const std::string& tagname = "" );

[3.259378]

[5.3083]

    Menu(int flags = MF_MULTISELECT, const std::string& tagname = "",
         bool text_only = true);

Deletion in crawl-ref/source/menu.h at line 333 [3.255942]

B:BD[6.464] → [2.2556:2645]

    // For tiles, whether this is a menu that can display graphics.
    bool text_only;

Insertion in crawl-ref/source/menu.cc at line 23 [3.261322]
[7.25113]
[7.25113]
```
    m_menu->set_maxpagesize(get_number_of_lines());
```
Replacement in crawl-ref/source/menu.cc at line 83 [3.261322]
∅:D[7.26397] → [4.702:755]
B:BD[3.261397] → [4.702:755]
```
Menu::Menu( int _flags, const std::string& tagname )
```
[7.26397]
[5.3649]
```
Menu::Menu( int _flags, const std::string& tagname, bool text_only )
```

Replacement in crawl-ref/source/menu.cc at line 88 [3.261322]

B:BD[5.3914] → [2.2647:2710]

   lastch(0), alive(false), text_only(true), last_selected(-1)

[5.3914]

[3.261668]

   lastch(0), alive(false), last_selected(-1)

Replacement in crawl-ref/source/menu.cc at line 91 [3.261322]

B:BD[7.26414] → [7.26414:26456]

    mdisplay = new MenuDisplayTile(this);

[7.26414]

[7.26456]

    if (text_only)
        mdisplay = new MenuDisplayText(this);
    else
        mdisplay = new MenuDisplayTile(this);

Replacement in crawl-ref/source/menu.cc at line 114 [3.261322]
B:BD[7.26528] → [7.26528:26570]
```
    mdisplay = new MenuDisplayTile(this);
```
[7.26528]
[7.26570]
```
    mdisplay = new MenuDisplayText(this);
```

Replacement in crawl-ref/source/menu.cc at line 279 [3.261322]

B:BD[8.4322] → [2.2711:2842]

    if (text_only)
        pagesize = get_number_of_lines() - !!title - 1;
    else
        pagesize = max_pagesize - !!title - 1;

[8.4322]

[8.4365]

    pagesize = max_pagesize - !!title - 1;

Replacement in crawl-ref/source/invent.cc at line 273 [10.2920632]

B:BD[9.10547] → [9.10547:10616]

    : Menu(mflags, "inventory"), type(MT_INVLIST), pre_select(NULL),

[9.10547]

[9.10616]

    : Menu(mflags, "inventory", false), type(MT_INVLIST), pre_select(NULL),

Deletion in crawl-ref/source/invent.cc at line 277 [10.2920632]
B:BD[9.10679] → [2.2892:2915]
```
    text_only = false;
```