diff options
| author | Strangerke | 2013-03-20 07:56:16 +0100 |
|---|---|---|
| committer | Strangerke | 2013-03-20 07:56:16 +0100 |
| commit | c5c7ced5ee2186ace50549ca9e14b70708de5b54 (patch) | |
| tree | 77b5e05b0c331db94f0ad262b6813d60f945681e /engines/hopkins/globals.cpp | |
| parent | 56ae0044750a6f4bbe936ba304e9f726fba70dad (diff) | |
| download | scummvm-rg350-c5c7ced5ee2186ace50549ca9e14b70708de5b54.tar.gz scummvm-rg350-c5c7ced5ee2186ace50549ca9e14b70708de5b54.tar.bz2 scummvm-rg350-c5c7ced5ee2186ace50549ca9e14b70708de5b54.zip | |
HOPKINS: Remove setParent() from MenuManager and ObjectsManager
Diffstat (limited to 'engines/hopkins/globals.cpp')
| -rw-r--r-- | engines/hopkins/globals.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index 3d82081d29..6cf7251e92 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -244,10 +244,10 @@ void Globals::clearAll() { _answerBuffer = g_PTRNUL; SPRITE_ECRAN = g_PTRNUL; _saveData = (Savegame *)g_PTRNUL; - _vm->_objectsManager._curObjectIndex = 0; + _vm->_objectsManager->_curObjectIndex = 0; _vm->_linesManager->clearAll(); - _vm->_objectsManager.clearAll(); + _vm->_objectsManager->clearAll(); _saveData = (Savegame *)malloc(sizeof(Savegame)); memset(_saveData, 0, sizeof(Savegame)); @@ -378,7 +378,7 @@ void Globals::disableHiding() { void Globals::B_CACHE_OFF(int idx) { assert(idx < 36); - _vm->_objectsManager._bob[idx].field34 = true; + _vm->_objectsManager->_bob[idx].field34 = true; } void Globals::resetHidingUseCount(int idx) { @@ -411,8 +411,8 @@ void Globals::loadHidingItems(const Common::String &file) { _hidingItem[i]._useCount = 0; } else { _hidingItem[i]._spriteData = spriteData; - _hidingItem[i]._width = _vm->_objectsManager.getWidth(spriteData, _hidingItem[i]._spriteIndex); - _hidingItem[i]._height = _vm->_objectsManager.getHeight(spriteData, _hidingItem[i]._spriteIndex); + _hidingItem[i]._width = _vm->_objectsManager->getWidth(spriteData, _hidingItem[i]._spriteIndex); + _hidingItem[i]._height = _vm->_objectsManager->getHeight(spriteData, _hidingItem[i]._spriteIndex); _hidingItem[i]._useCount = 1; } |