diff options
| author | Paul Gilbert | 2014-04-05 21:30:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-05 21:30:42 -0400 |
| commit | 11403c5db6eac282e0e1f28623ac25ab95517792 (patch) | |
| tree | 31b6271b07242e5719e3d5ec5859c70b2743bbec /engines/mads/screen.cpp | |
| parent | e37d1b72808e3179985bb0d6fe320e105c822688 (diff) | |
| download | scummvm-rg350-11403c5db6eac282e0e1f28623ac25ab95517792.tar.gz scummvm-rg350-11403c5db6eac282e0e1f28623ac25ab95517792.tar.bz2 scummvm-rg350-11403c5db6eac282e0e1f28623ac25ab95517792.zip | |
MADS: Further cleanup of previously anonymous fields
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 f03f89122f..25623bc215 100644 --- a/engines/mads/screen.cpp +++ b/engines/mads/screen.cpp @@ -252,7 +252,7 @@ ScreenObject::ScreenObject() { ScreenObjects::ScreenObjects(MADSEngine *vm) : _vm(vm) { _objectY = -1; - _v8333C = false; + _forceRescan = false; _inputMode = kInputBuildingSentences; _v7FED6 = 0; _v8332A = 0; @@ -289,7 +289,7 @@ void ScreenObjects::check(bool scanFlag) { _vm->_events->_rightMousePressed = false; if ((_vm->_events->_mouseMoved || _vm->_game->_scene._userInterface._scrollerY - || _v8332A || _v8333C) && scanFlag) { + || _v8332A || _forceRescan) && scanFlag) { _category = CAT_NONE; _selectedObject = scanBackwards(_vm->_events->currentPos(), LAYER_GUI); if (_selectedObject > 0) { @@ -320,7 +320,7 @@ void ScreenObjects::check(bool scanFlag) { } } - if (_vm->_events->_mouseButtons || (_vm->_easyMouse && scene._action._interAwaiting > 1 + if (_vm->_events->_mouseButtons || (_vm->_easyMouse && scene._action._interAwaiting > AWAITING_COMMAND && scene._userInterface._category == CAT_INV_LIST) || (_vm->_easyMouse && scene._userInterface._category == CAT_HOTSPOT)) { scene._action.checkActionAtMousePos(); @@ -337,7 +337,7 @@ void ScreenObjects::check(bool scanFlag) { if (_vm->_events->_mouseButtons || _vm->_easyMouse) scene._action.set(); - _v8333C = 0; + _forceRescan = 0; } scene._action.refresh(); |