HOPKINS: Remove setParent() from LinesManager

scummvm · Mar 20, 2013 · 56ae004 · 56ae004
1 parent 6a446ff
commit 56ae004
Show file tree

Hide file tree

Showing 9 changed files with 361 additions and 365 deletions.
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
@@ -394,7 +394,7 @@ void DialogsManager::showInventory() {
 			int mousePosY = _vm->_eventsManager->getMouseY();
 			int mouseButton = _vm->_eventsManager->getMouseButton();
 			int oldInventoryItem = newInventoryItem;
-			newInventoryItem = _vm->_linesManager.checkInventoryHotspots(mousePosX, mousePosY);
+			newInventoryItem = _vm->_linesManager->checkInventoryHotspots(mousePosX, mousePosY);
 			if (newInventoryItem != oldInventoryItem)
 				_vm->_objectsManager.initBorder(newInventoryItem);
 			if (_vm->_eventsManager->_mouseCursorId != 1 && _vm->_eventsManager->_mouseCursorId != 2 && _vm->_eventsManager->_mouseCursorId != 3 && _vm->_eventsManager->_mouseCursorId != 16) {

diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
@@ -246,7 +246,7 @@ void Globals::clearAll() {
 	_saveData = (Savegame *)g_PTRNUL;
 	_vm->_objectsManager._curObjectIndex = 0;
 
-	_vm->_linesManager.clearAll();
+	_vm->_linesManager->clearAll();
 	_vm->_objectsManager.clearAll();
 
 	_saveData = (Savegame *)malloc(sizeof(Savegame));