diff options
| author | Strangerke | 2013-04-10 09:00:08 +0200 |
|---|---|---|
| committer | Strangerke | 2013-04-10 09:00:08 +0200 |
| commit | 9f4a35b011971949cfe67941f2725effb0c85baf (patch) | |
| tree | 65aef6494a035c837703893c84dd961374af9a35 /engines/hopkins/dialogs.cpp | |
| parent | 9e956d888e3443fe00013757cecc99bb13011e88 (diff) | |
| download | scummvm-rg350-9f4a35b011971949cfe67941f2725effb0c85baf.tar.gz scummvm-rg350-9f4a35b011971949cfe67941f2725effb0c85baf.tar.bz2 scummvm-rg350-9f4a35b011971949cfe67941f2725effb0c85baf.zip | |
HOPKINS: Move _oldInventoryPosX to DialogsManager, remove a useless variable
Diffstat (limited to 'engines/hopkins/dialogs.cpp')
| -rw-r--r-- | engines/hopkins/dialogs.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index 4f534289b6..df8706ae3f 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -43,6 +43,7 @@ DialogsManager::DialogsManager(HopkinsEngine *vm) { _inventDisplayedFl = false; _removeInventFl = false; _inventX = _inventY = 0; + _oldInventX = 0; _inventWidth = _inventHeight = 0; _inventWin1 = NULL; _inventBuf2 = NULL; @@ -502,23 +503,23 @@ void DialogsManager::inventAnim() { return; if (_vm->_objectsManager->_eraseVisibleCounter && !_vm->_objectsManager->_visibleFl) { - _vm->_graphicsManager->copySurface(_vm->_graphicsManager->_backBuffer, _vm->_objectsManager->_oldInventoryPosX, 27, 48, 38, - _vm->_graphicsManager->_frontBuffer, _vm->_objectsManager->_oldInventoryPosX, 27); - _vm->_graphicsManager->addDirtyRect(_vm->_objectsManager->_oldInventoryPosX, 27, _vm->_objectsManager->_oldInventoryPosX + 48, 65); + _vm->_graphicsManager->copySurface(_vm->_graphicsManager->_backBuffer, _oldInventX, 27, 48, 38, + _vm->_graphicsManager->_frontBuffer, _oldInventX, 27); + _vm->_graphicsManager->addDirtyRect(_oldInventX, 27, _oldInventX + 48, 65); --_vm->_objectsManager->_eraseVisibleCounter; } if (_vm->_objectsManager->_visibleFl) { - if (_vm->_objectsManager->_oldInventoryPosX <= 1) - _vm->_objectsManager->_oldInventoryPosX = 2; - _vm->_graphicsManager->copySurface(_vm->_graphicsManager->_backBuffer, _vm->_objectsManager->_oldInventoryPosX, 27, 48, 38, - _vm->_graphicsManager->_frontBuffer, _vm->_objectsManager->_oldInventoryPosX, 27); + if (_oldInventX <= 1) + _oldInventX = 2; + _vm->_graphicsManager->copySurface(_vm->_graphicsManager->_backBuffer, _oldInventX, 27, 48, 38, + _vm->_graphicsManager->_frontBuffer, _oldInventX, 27); - _vm->_graphicsManager->addDirtyRect(_vm->_objectsManager->_oldInventoryPosX, 27, _vm->_objectsManager->_oldInventoryPosX + 48, 65); + _vm->_graphicsManager->addDirtyRect(_oldInventX, 27, _oldInventX + 48, 65); int newOffset = _vm->_graphicsManager->_scrollOffset + 2; _vm->_graphicsManager->drawVesaSprite(_vm->_graphicsManager->_frontBuffer, _inventoryIcons, newOffset + 300, 327, 0); _vm->_graphicsManager->addDirtyRect(newOffset, 27, newOffset + 45, 62); - _vm->_objectsManager->_oldInventoryPosX = newOffset; + _oldInventX = newOffset; } if (_vm->_globals->_saveData->_data[svField357] == 1) { |