ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

HOPKINS: JANITORIAL: remove useless object pointers in ObjectsManager

Browse Source
This commit is contained in:
Strangerke
2013-03-25 08:31:09 +01:00
parent 023aa2765c
commit cfe42b15b1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/hopkins/objects.cpp
+8 -8
View File
@@ -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;
}