HOPKINS: Move _oldInventoryPosX to DialogsManager, remove a useless variable

4 files changed, 11 insertions, 11 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) {
diff --git a/engines/hopkins/dialogs.h b/engines/hopkins/dialogs.h
index 8196e0bbc5..246b80cd3e 100644
--- a/engines/hopkins/dialogs.h
+++ b/engines/hopkins/dialogs.h
@@ -46,6 +46,7 @@ private:
 	bool _removeInventFl;
 	int _inventX, _inventY;
 	int _inventWidth, _inventHeight;
+	int _oldInventX;
 
 	HopkinsEngine *_vm;
 
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 100c7f81bd..f11810d89b 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -75,7 +75,6 @@ ObjectsManager::ObjectsManager(HopkinsEngine *vm) {
 	_borderPos = Common::Point(0, 0);
 	_borderSpriteIndex = 0;
 	_saveLoadX = _saveLoadY = 0;
-	_oldInventoryPosX = _oldInventoryPosY = 0;
 	_oldCharacterPosX = _oldCharacterPosY = 0;
 	_eraseVisibleCounter = 0;
 	_saveLoadSprite = NULL;
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index e0c05bbe1f..dca7e5ce7c 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -227,7 +227,6 @@ public:
 	int _eraseVisibleCounter;
 	int _curObjectIndex;
 	int _startSpriteIndex;
-	int _oldInventoryPosX, _oldInventoryPosY;
 	int _saveLoadX, _saveLoadY;
 	int _mapCarPosX, _mapCarPosY;
 	int _oldCharacterPosX, _oldCharacterPosY;