diff options
| author | Paul Gilbert | 2014-04-08 22:04:43 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-08 22:04:43 -0400 |
| commit | 531ebab4da814aac23a9b084772a6156bfb3b9b8 (patch) | |
| tree | d30f2483c62590706428a90738cf53135381a3d8 /engines/mads/screen.cpp | |
| parent | cd77110093c32f07b84325684ada9a425bdf6c93 (diff) | |
| download | scummvm-rg350-531ebab4da814aac23a9b084772a6156bfb3b9b8.tar.gz scummvm-rg350-531ebab4da814aac23a9b084772a6156bfb3b9b8.tar.bz2 scummvm-rg350-531ebab4da814aac23a9b084772a6156bfb3b9b8.zip | |
MADS: Added preliminary keyboard handling and keypress process stub
Diffstat (limited to 'engines/mads/screen.cpp')
| -rw-r--r-- | engines/mads/screen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index 78980fe2a7..5553f61a11 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -313,7 +313,7 @@ void ScreenObjects::check(bool scanFlag) { } //_released = _vm->_events->_mouseReleased; - if (_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_vD4)) + if (_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy)) scene._userInterface._category = _category; if (!_vm->_events->_mouseButtons || _vm->_easyMouse) { @@ -387,9 +387,9 @@ void ScreenObjects::checkScroller() { userInterface._scrollerY = 0; - if ((_category == CAT_INV_SCROLLER || (_scrollerY == 3 && _vm->_events->_vD4)) - && (_vm->_events->_vD4 || _vm->_easyMouse)) { - if ((_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_vD4)) + if ((_category == CAT_INV_SCROLLER || (_scrollerY == 3 && _vm->_events->_mouseStatusCopy)) + && (_vm->_events->_mouseStatusCopy || _vm->_easyMouse)) { + if ((_vm->_events->_vD2 || (_vm->_easyMouse && !_vm->_events->_mouseStatusCopy)) && _category == CAT_INV_SCROLLER) { _currentDescId = _newDescId; } |