diff options
| author | Max Horn | 2009-03-24 12:14:41 +0000 |
|---|---|---|
| committer | Max Horn | 2009-03-24 12:14:41 +0000 |
| commit | 33895c0220c114653ee77a347452f03e8b8654f7 (patch) | |
| tree | 022d97d59e18fc1159240396da6fa9c5070babe4 /engines/sci/engine | |
| parent | 608b839720a028b5ecffa5955b024387740583d7 (diff) | |
| download | scummvm-rg350-33895c0220c114653ee77a347452f03e8b8654f7.tar.gz scummvm-rg350-33895c0220c114653ee77a347452f03e8b8654f7.tar.bz2 scummvm-rg350-33895c0220c114653ee77a347452f03e8b8654f7.zip | |
SCI: Only pass the pointerpos to Menubar::mapPointer, not the full gfx_state_t
svn-id: r39662
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kmenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp index 601011eff3..3304acf2de 100644 --- a/engines/sci/engine/kmenu.cpp +++ b/engines/sci/engine/kmenu.cpp @@ -193,7 +193,7 @@ reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) { /* Default to menu 0, unless the mouse was used to generate this effect */ if (mouse_down) - s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port); + s->_menubar->mapPointer(s->gfx_state->pointer_pos, menu_nr, item_nr, port); else menu_nr = 0; @@ -267,7 +267,7 @@ reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) { case SCI_EVT_MOUSE_RELEASE: menu_mode = (s->gfx_state->pointer_pos.y < 10); - claimed = !menu_mode && !s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port); + claimed = !menu_mode && !s->_menubar->mapPointer(s->gfx_state->pointer_pos, menu_nr, item_nr, port); mouse_down = 0; break; @@ -281,7 +281,7 @@ reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) { } if (mouse_down) - s->_menubar->mapPointer(s->gfx_state, &menu_nr, &item_nr, port); + s->_menubar->mapPointer(s->gfx_state->pointer_pos, menu_nr, item_nr, port); if ((item_nr > -1 && old_item == -1) || (menu_nr != old_menu)) { /* Update menu */ |