diff options
| author | Strangerke | 2013-03-24 13:55:11 +0100 |
|---|---|---|
| committer | Strangerke | 2013-03-24 13:55:11 +0100 |
| commit | 4ff6e13e023c3ad95f22caabdab81af9b3bc7d02 (patch) | |
| tree | ea623d0212e8c7243b8d7efeb2ea7157ca727e6d /engines/hopkins/objects.cpp | |
| parent | f782ca1c10b3e74fecedf0e6b3178529cad88ed0 (diff) | |
| download | scummvm-rg350-4ff6e13e023c3ad95f22caabdab81af9b3bc7d02.tar.gz scummvm-rg350-4ff6e13e023c3ad95f22caabdab81af9b3bc7d02.tar.bz2 scummvm-rg350-4ff6e13e023c3ad95f22caabdab81af9b3bc7d02.zip | |
HOPKINS: Set private more variables in DialogsManager
Diffstat (limited to 'engines/hopkins/objects.cpp')
| -rw-r--r-- | engines/hopkins/objects.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index d753d57fab..84ea104dc4 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -408,9 +408,8 @@ void ObjectsManager::displaySprite() { } _vm->_globals->_sortedDisplayCount = 0; - if (_vm->_dialogsManager->_inventDisplayedFl) { - _vm->_dialogsManager->drawInvent(_oldBorderPos, _oldBorderSpriteIndex, _borderPos, _borderSpriteIndex); - } + + _vm->_dialogsManager->drawInvent(_oldBorderPos, _oldBorderSpriteIndex, _borderPos, _borderSpriteIndex); if (_saveLoadFl) { _vm->_graphicsManager->restoreSurfaceRect(_vm->_graphicsManager->_vesaBuffer, _saveLoadSprite, _vm->_eventsManager->_startPos.x + 183, 60, 274, 353); @@ -3613,7 +3612,7 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in if (_vm->_globals->_saveData->_data[savegameIdx]) { if (_vm->_globals->_saveData->_data[savegameIdx] == 1) { if (((idx == 1 || idx == 2) && getBobAnimDataIdx(idx) == 26) || ((idx == 3 || idx == 4) && getBobAnimDataIdx(idx) == 27)) { - _vm->_dialogsManager->_removeInventFl = true; + _vm->_dialogsManager->disableInvent(); _vm->_soundManager->playSample(1); _vm->_globals->_saveData->_data[savegameIdx] = 4; } @@ -3654,7 +3653,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen) { _vm->_dialogsManager->_inventFl = false; _vm->_eventsManager->_gameKey = KEY_NONE; - _vm->_dialogsManager->_removeInventFl = false; + _vm->_dialogsManager->enableInvent(); _vm->_graphicsManager->_scrollOffset = 0; _vm->_globals->_cityMapEnabledFl = false; _vm->_globals->iRegul = 1; @@ -3744,7 +3743,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm _vm->_eventsManager->_gameKey = KEY_NONE; _verb = 4; _vm->_graphicsManager->_scrollOffset = 0; - _vm->_dialogsManager->_removeInventFl = false; + _vm->_dialogsManager->enableInvent(); _vm->_globals->_cityMapEnabledFl = false; _vm->_graphicsManager->_noFadingFl = false; _vm->_globals->_freezeCharacterFl = false; |