diff options
| author | Strangerke | 2013-03-25 08:31:09 +0100 |
|---|---|---|
| committer | Strangerke | 2013-03-25 08:31:09 +0100 |
| commit | cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83 (patch) | |
| tree | 5b49f3c687efefe517cfabcfd6cb5001de09a0bc | |
| parent | 023aa2765c1acdacf76254a334647ce0ffe66155 (diff) | |
| download | scummvm-rg350-cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83.tar.gz scummvm-rg350-cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83.tar.bz2 scummvm-rg350-cfe42b15b1bc1ab74cdad90b7dcafe6f0859ff83.zip | |
HOPKINS: JANITORIAL: remove useless object pointers in ObjectsManager
| -rw-r--r-- | engines/hopkins/objects.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index c686895cc4..eec65aca3c 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -1030,8 +1030,8 @@ void ObjectsManager::displayBobAnim() { byte *dataPtr = _bob[idx]._animData + 20; int dataIdx = _bob[idx]._animDataIdx; _bob[idx]._xp = READ_LE_INT16(dataPtr + 2 * dataIdx); - if (_vm->_objectsManager->_lockedAnims[idx]._enableFl) - _bob[idx]._xp = _vm->_objectsManager->_lockedAnims[idx]._posX; + if (_lockedAnims[idx]._enableFl) + _bob[idx]._xp = _lockedAnims[idx]._posX; if ( PERSO_ON && idx > 20 ) _bob[idx]._xp += _vm->_eventsManager->_startPos.x; @@ -1063,8 +1063,8 @@ void ObjectsManager::displayBobAnim() { byte *bobData = _bob[idx]._animData + 20; _bob[idx]._xp = READ_LE_INT16(bobData); - if (_vm->_objectsManager->_lockedAnims[idx]._enableFl) - _bob[idx]._xp = _vm->_objectsManager->_lockedAnims[idx]._posX; + if (_lockedAnims[idx]._enableFl) + _bob[idx]._xp = _lockedAnims[idx]._posX; if (PERSO_ON && idx > 20) _bob[idx]._xp += _vm->_eventsManager->_startPos.x; @@ -3729,8 +3729,8 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in } void ObjectsManager::lockAnimX(int idx, int x) { - _vm->_objectsManager->_lockedAnims[idx]._enableFl = true; - _vm->_objectsManager->_lockedAnims[idx]._posX = x; + _lockedAnims[idx]._enableFl = true; + _lockedAnims[idx]._posX = x; } /** @@ -4003,8 +4003,8 @@ void ObjectsManager::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 = getWidth(spriteData, _hidingItem[i]._spriteIndex); + _hidingItem[i]._height = getHeight(spriteData, _hidingItem[i]._spriteIndex); _hidingItem[i]._useCount = 1; } |