diff options
| author | Strangerke | 2013-02-11 00:15:00 +0100 |
|---|---|---|
| committer | Strangerke | 2013-02-11 00:15:00 +0100 |
| commit | 705d00470a092da515e12e1f5c192d3ed36a0b42 (patch) | |
| tree | 92668cb453de94b21731f67116ba1607a28c98ad /engines/hopkins/lines.cpp | |
| parent | 0f09b3d79349caaa7c249a81c38d74e7d3a20089 (diff) | |
| download | scummvm-rg350-705d00470a092da515e12e1f5c192d3ed36a0b42.tar.gz scummvm-rg350-705d00470a092da515e12e1f5c192d3ed36a0b42.tar.bz2 scummvm-rg350-705d00470a092da515e12e1f5c192d3ed36a0b42.zip | |
HOPKINS: Move _bob to ObjectsManager
Diffstat (limited to 'engines/hopkins/lines.cpp')
| -rw-r--r-- | engines/hopkins/lines.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 32190d896f..93ffd5647c 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -2966,17 +2966,17 @@ int LinesManager::MZONE() { if ((_vm->_eventsManager._mousePos.y + _vm->_eventsManager._mouseOffset.y) > 19) { for (int bobZoneId = 0; bobZoneId <= 48; bobZoneId++) { int bobId = _vm->_globals.BOBZONE[bobZoneId]; - if (bobId && _vm->_globals.BOBZONE_FLAG[bobZoneId] && _vm->_globals._bob[bobId].field0 && _vm->_globals._bob[bobId]._frameIndex != 250 && - !_vm->_globals._bob[bobId]._disabledAnimationFl && xp > _vm->_globals._bob[bobId]._oldX && - xp < _vm->_globals._bob[bobId]._oldWidth + _vm->_globals._bob[bobId]._oldX && yp > _vm->_globals._bob[bobId]._oldY) { - if (yp < _vm->_globals._bob[bobId]._oldHeight + _vm->_globals._bob[bobId]._oldY) { + if (bobId && _vm->_globals.BOBZONE_FLAG[bobZoneId] && _vm->_objectsManager._bob[bobId].field0 && _vm->_objectsManager._bob[bobId]._frameIndex != 250 && + !_vm->_objectsManager._bob[bobId]._disabledAnimationFl && xp > _vm->_objectsManager._bob[bobId]._oldX && + xp < _vm->_objectsManager._bob[bobId]._oldWidth + _vm->_objectsManager._bob[bobId]._oldX && yp > _vm->_objectsManager._bob[bobId]._oldY) { + if (yp < _vm->_objectsManager._bob[bobId]._oldHeight + _vm->_objectsManager._bob[bobId]._oldY) { if (_vm->_globals.ZONEP[bobZoneId]._spriteIndex == -1) { _vm->_globals.ZONEP[bobZoneId]._destX = 0; _vm->_globals.ZONEP[bobZoneId]._destY = 0; } if (!_vm->_globals.ZONEP[bobZoneId]._destX && !_vm->_globals.ZONEP[bobZoneId]._destY) { - _vm->_globals.ZONEP[bobZoneId]._destX = _vm->_globals._bob[bobId]._oldWidth + _vm->_globals._bob[bobId]._oldX; - _vm->_globals.ZONEP[bobZoneId]._destY = _vm->_globals._bob[bobId]._oldHeight + _vm->_globals._bob[bobId]._oldY + 6; + _vm->_globals.ZONEP[bobZoneId]._destX = _vm->_objectsManager._bob[bobId]._oldWidth + _vm->_objectsManager._bob[bobId]._oldX; + _vm->_globals.ZONEP[bobZoneId]._destY = _vm->_objectsManager._bob[bobId]._oldHeight + _vm->_objectsManager._bob[bobId]._oldY + 6; _vm->_globals.ZONEP[bobZoneId]._spriteIndex = -1; } return bobZoneId; |