diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-30 19:13:17 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-30 19:13:17 +0000 |
| commit | f4bb02dd66fdf77bfd0ec304e4ae160a27916f42 (patch) | |
| tree | 3548083ff164b98e4d59b36050241d64921dbe3a /crawl-ref/source/tilereg.cc | |
| parent | 5277bf424bbd6aeab3d8296ce68695717cfff9ed (diff) | |
| download | crawl-ref-f4bb02dd66fdf77bfd0ec304e4ae160a27916f42.tar.gz crawl-ref-f4bb02dd66fdf77bfd0ec304e4ae160a27916f42.zip | |
* AutoID rings of teleport control after teleporting.
* Fix 2788773: Infinite scroll uses by clicking on a stack in tiles.
* Fix 2792095: Tiled menus possibly containing more than 52 items.
* Fix clicking on items not setting just_clicked_on_item until after the
effect happened.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9853 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 11bc7df8da..007f16c99c 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -1510,6 +1510,7 @@ int InventoryRegion::handle_mouse(MouseEvent &event) if (event.button == MouseEvent::LEFT) { + you.last_clicked_item = item_idx; if (on_floor) { if (event.mod & MOD_SHIFT) @@ -1526,12 +1527,12 @@ int InventoryRegion::handle_mouse(MouseEvent &event) else tile_item_use(idx); } - you.last_clicked_item = item_idx; // TODO enne - need to redraw inventory here? return CK_MOUSE_CMD; } else if (event.button == MouseEvent::RIGHT) { + you.last_clicked_item = item_idx; if (on_floor) { if (event.mod & MOD_SHIFT) @@ -2831,6 +2832,12 @@ int MenuRegion::maxpagesize() const int more_height = (lines + 1) * m_font_entry->char_height(); int pagesize = ((my - more_height) / 32) * m_max_columns; + + // Upper limit for inventory menus. (jpeg) + // Non-inventory menus only have one column and need + // *really* big screens to cover more than 52 lines. + if (pagesize > 52) + return (52); return (pagesize); } |