diff --git a/engines/mads/action.h b/engines/mads/action.h index 343f9154da0..b38e9c24e03 100644 --- a/engines/mads/action.h +++ b/engines/mads/action.h @@ -88,7 +88,7 @@ private: void appendVocab(int vocabId, bool capitalise = false); - void startWalkingDirectly(int v); + void startWalkingDirectly(int walkType); public: ActionDetails _action, _activeAction; int8 _flags1, _flags2; diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp index d0d3b272ada..d964c14451b 100644 --- a/engines/mads/game.cpp +++ b/engines/mads/game.cpp @@ -171,7 +171,7 @@ void Game::sectionLoop() { _visitedScenes.add(_scene._nextSceneId); // Reset the user interface - _screenObjects._v8333C = true; + _screenObjects._forceRescan = true; _screenObjects._inputMode = kInputBuildingSentences; _scene._userInterface._scrollerY = 0; diff --git a/engines/mads/hotspots.cpp b/engines/mads/hotspots.cpp index fec1f6ef96b..24ff1722e8d 100644 --- a/engines/mads/hotspots.cpp +++ b/engines/mads/hotspots.cpp @@ -135,7 +135,7 @@ void DynamicHotspots::refresh() { case kInputBuildingSentences: case kInputLimitedSentences: scrObjects.add(dh._bounds, _vm->_game->_scene._layer, CAT_12, dh._descId); - scrObjects._v8333C = true; + scrObjects._forceRescan = true; break; default: break; diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp index f03f89122f9..25623bc2155 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(); diff --git a/engines/mads/screen.h b/engines/mads/screen.h index 3595907b73f..ed3de80576d 100644 --- a/engines/mads/screen.h +++ b/engines/mads/screen.h @@ -157,7 +157,7 @@ public: InputMode _inputMode; int _v7FED6; int _v8332A; - int _v8333C; + int _forceRescan; int _selectedObject; ScrCategory _category; int _newDescId;