fiddlerwoaroof/crawl - Change 2H6MSLB3SR42LG524K2QHJVCZ747RHAKI3VHFVTQ2K7X2LSOIEDQC

Tiles:

(Re?)allow mouseclicks in menus (Tiles, only): L-click = scroll down, R-click = Esc
Clear last_clicked_grid if you move your mouse.
When entering a new level, draw the map before handling monster shouts.

Enne, please review the changes. Thanks!

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

Created by j-p-e-g on March 8, 2009

2H6MSLB3SR42LG524K2QHJVCZ747RHAKI3VHFVTQ2K7X2LSOIEDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilesdl.cc at line 595 [5.19415]

B:BD[5.28891] → [5.28891:28957]

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

[5.28891]

[5.28957]

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

Insertion in crawl-ref/source/tilereg.cc at line 877 [5.54399]
[5.81635]
[5.81635]
```
    you.last_clicked_grid = m_cursor[CURSOR_MOUSE];
```
Deletion in crawl-ref/source/tilereg.cc at line 927 [5.54399]
B:BD[5.83050] → [6.1679:1731]
```
    you.last_clicked_grid = m_cursor[CURSOR_MOUSE];
```
Insertion in crawl-ref/source/tilereg.cc at line 959 [5.54399]
[5.84035]
[5.84513]
```
    coord_def result = gc;
```
Deletion in crawl-ref/source/tilereg.cc at line 971 [5.54399]
B:BD[5.84892] → [5.84892:84931]
```
        coord_def result = you.pos();
```
Insertion in crawl-ref/source/tilereg.cc at line 972 [5.54399]
[5.84932]
[5.84932]
```
        result = you.pos();
```
Insertion in crawl-ref/source/tilereg.cc at line 981 [5.54399]
[5.85363]
[5.85363]
```
    }
```

Replacement in crawl-ref/source/tilereg.cc at line 983 [5.54399]

B:BD[5.85364] → [3.240:363]

∅:D[3.363] → [5.85397:85412]

B:BD[5.85397] → [5.85397:85412]

        if (m_cursor[type] != result)
        {
            m_dirty = true;
            m_cursor[type] = result;
        }
    }
    else

[5.85364]

[5.85412]

    if (m_cursor[type] != result)

Replacement in crawl-ref/source/tilereg.cc at line 985 [5.54399]

B:BD[5.85418] → [3.364:479]

        if (m_cursor[type] != gc)
        {
            m_dirty = true;
            m_cursor[type] = gc;
        }

[5.85418]

[5.85785]

        m_dirty = true;
        coord_def old_cursor = m_cursor[type];
        m_cursor[type] = result;
        if (type == CURSOR_MOUSE)
            you.last_clicked_grid = coord_def();

Replacement in crawl-ref/source/tilereg.cc at line 1701 [5.54399]
B:BD[5.100825] → [5.100825:100859]
```
                tip += "Unwield";
```
[5.100825]
[7.445]
```
                tip += "Unwield (w-)";
```

Replacement in crawl-ref/source/tilereg.cc at line 1709 [5.54399]

B:BD[5.101188] → [5.101188:101289]

                    tip += "Draw a card (v)";
                    tip += "\n[Ctrl-L-Click] Unwield";

[5.101188]

[5.101289]

                    tip += "Draw a card (v)\n";
                    tip += "[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1715 [5.54399]

B:BD[5.101452] → [5.101452:101539]

                tip += "Evoke (v)";
                tip += "\n[Ctrl-L-Click] Unwield";

[5.101452]

[5.101539]

                tip += "Evoke (v)\n";
                tip += "[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1734 [5.54399]

B:BD[5.102050] → [5.102050:102105]

                    tip += "\n[Ctrl-L-Click] Unwield";

[5.102050]

[6.2240]

                    tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1748 [5.54399]

B:BD[5.102697] → [5.102697:102752]

                    tip += "\n[Ctrl-L-Click] Unwield";

[5.102697]

[5.102752]

                    tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1757 [5.54399]

B:BD[5.103049] → [5.103049:103108]

                        tip += "\n[Ctrl-L-Click] Unwield";

[5.103049]

[5.103108]

                        tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1764 [5.54399]

B:BD[5.103284] → [5.103284:103339]

                    tip += "\n[Ctrl-L-Click] Unwield";

[5.103284]

[5.103339]

                    tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1770 [5.54399]

B:BD[5.103502] → [5.103502:103557]

                    tip += "\n[Ctrl-L-Click] Unwield";

[5.103502]

[6.2488]

                    tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1782 [5.54399]

B:BD[5.104018] → [5.104018:104073]

                    tip += "\n[Ctrl-L-Click] Unwield";

[5.104018]

[5.104073]

                    tip += "\n[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1798 [5.54399]

B:BD[5.104609] → [5.104609:104662]

                    tip += "[Ctrl-L-Click] Unwield";

[5.104609]

[5.104662]

                    tip += "[Ctrl-L-Click] Unwield (w-)";

Replacement in crawl-ref/source/tilereg.cc at line 1838 [5.54399]

B:BD[8.4242] → [4.1797:1840]

    if (item_idx == you.last_clicked_item)

[8.4242]

[4.1840]

    if (you.last_clicked_item >= 0
        && item_idx == (unsigned int) you.last_clicked_item)
    {

Replacement in crawl-ref/source/tilereg.cc at line 1842 [5.54399]
B:BD[4.1864] → [4.1864:1865]
[4.1864]
[8.4242]
```
    }
```

Replacement in crawl-ref/source/output.cc at line 2109 [10.1088282]

B:BD[9.4279] → [9.4279:4359]

                       "<cyan>[ + : Page down.   - : Page up.   Esc exits.]"));

[9.4279]

[9.4359]

#ifdef USE_TILE
                        "<cyan>[ +/L-click : Page down.   - : Page up."
                        "           Esc/R-click exits.]"));
#else
                        "<cyan>[ + : Page down.   - : Page up."
                        "                           Esc exits.]"));
#endif

Replacement in crawl-ref/source/menu.cc at line 301 [11.261322]

B:BD[11.262775] → [2.2423:2469]

        int keyin = getchm(KC_MENU, c_getch);

[11.262775]

[12.5750101]

        mouse_control mc(MOUSE_MODE_MORE);
        int keyin =
#ifndef USE_TILE
            getchm(KC_MENU, c_getch);
#else
            getch();
#endif

Insertion in crawl-ref/source/menu.cc at line 352 [11.261322]
[13.2708]
[14.566131]
```
    case CK_MOUSE_CMD:
```
Insertion in crawl-ref/source/menu.cc at line 358 [11.261322]
[13.2754]
[14.566247]
```
    case CK_MOUSE_CLICK:
```
Insertion in crawl-ref/source/menu.cc at line 1705 [11.261322]
[15.712]
[16.24187]
```
    case CK_MOUSE_CMD:
```
Insertion in crawl-ref/source/menu.cc at line 1709 [11.261322]
[12.5750544]
[15.815]
```
    case CK_MOUSE_CLICK:
```

Replacement in crawl-ref/source/items.cc at line 1255 [10.2584728]

B:BD[10.2610296] → [17.16868:16933]

                mprf(MSGCH_PROMPT, "Pick up %s? (y/n/a/*?g,/q)",

[10.2610296]

[18.2989]

                std::string prompt = "Pick up %s? ("
#ifdef USE_TILE
                                     "Left-click to enter menu, or press "
#endif
                                     "y/n/a/*?g,/q)";
                mprf(MSGCH_PROMPT, prompt.c_str(),

Deletion in crawl-ref/source/files.cc at line 1281 [10.3084589]
B:BD[19.10908] → [12.5932438:5932455]
```
#ifndef USE_TILE
```
Deletion in crawl-ref/source/files.cc at line 1282 [10.3084589]
B:BD[20.7025] → [12.5932456:5932463]
```
#endif
```

Insertion in crawl-ref/source/command.cc at line 218 [10.4082507]

[21.6092]

#ifdef USE_TILE
                              "<cyan>[ +/L-click : Page down.   - : Page up."
                              "           Esc/R-click exits.]"));
#else

Replacement in crawl-ref/source/command.cc at line 223 [10.4082507]

B:BD[21.6162] → [21.6162:6237]

                              "                           Esc exits.]") );

[21.6162]

[21.6237]

                              "                           Esc exits.]"));
#endif

Replacement in crawl-ref/source/command.cc at line 1836 [10.4082507]

B:BD[22.2312] → [22.2312:2450]

                           "<cyan>[ + : Page down.   - : Page up."
                           "                           Esc exits.]"));

[22.2312]

[22.2450]

#ifdef USE_TILE
                            "<cyan>[ +/L-click : Page down.   - : Page up."
                            "           Esc/R-click exits.]"));
#else
                            "<cyan>[ + : Page down.   - : Page up."
                            "                           Esc exits.]"));
#endif

Tiles:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilesdl.cc at line 595 [5.19415]

Insertion in crawl-ref/source/tilereg.cc at line 877 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 927 [5.54399]

Insertion in crawl-ref/source/tilereg.cc at line 959 [5.54399]

Deletion in crawl-ref/source/tilereg.cc at line 971 [5.54399]

Insertion in crawl-ref/source/tilereg.cc at line 972 [5.54399]

Insertion in crawl-ref/source/tilereg.cc at line 981 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 983 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 985 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1701 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1709 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1715 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1734 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1748 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1757 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1764 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1770 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1782 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1798 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1838 [5.54399]

Replacement in crawl-ref/source/tilereg.cc at line 1842 [5.54399]

Replacement in crawl-ref/source/output.cc at line 2109 [10.1088282]

Replacement in crawl-ref/source/menu.cc at line 301 [11.261322]

Insertion in crawl-ref/source/menu.cc at line 352 [11.261322]

Insertion in crawl-ref/source/menu.cc at line 358 [11.261322]

Insertion in crawl-ref/source/menu.cc at line 1705 [11.261322]

Insertion in crawl-ref/source/menu.cc at line 1709 [11.261322]

Replacement in crawl-ref/source/items.cc at line 1255 [10.2584728]

Deletion in crawl-ref/source/files.cc at line 1281 [10.3084589]

Deletion in crawl-ref/source/files.cc at line 1282 [10.3084589]

Insertion in crawl-ref/source/command.cc at line 218 [10.4082507]

Replacement in crawl-ref/source/command.cc at line 223 [10.4082507]

Replacement in crawl-ref/source/command.cc at line 1836 [10.4082507]