diff options
| author | Paul Gilbert | 2013-12-11 22:36:40 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2013-12-11 22:36:40 -0500 |
| commit | ae7bb13f20889c402b55f7d9ef55223b3437da06 (patch) | |
| tree | fec9138cfa013b8a847c5e57e1aadac2ee2f78a6 /engines | |
| parent | 7f018dafd5e56285e40d834de17447de3894a148 (diff) | |
| download | scummvm-rg350-ae7bb13f20889c402b55f7d9ef55223b3437da06.tar.gz scummvm-rg350-ae7bb13f20889c402b55f7d9ef55223b3437da06.tar.bz2 scummvm-rg350-ae7bb13f20889c402b55f7d9ef55223b3437da06.zip | |
VOYEUR: Fix loading of ControlResource
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/voyeur/files.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp index 9b1a0b186a..c725169140 100644 --- a/engines/voyeur/files.cpp +++ b/engines/voyeur/files.cpp @@ -1333,7 +1333,7 @@ PtrResource::PtrResource(BoltFilesState &state, const byte *src) { ControlResource::ControlResource(BoltFilesState &state, const byte *src) { // Get pointer uint32 ptrId = READ_LE_UINT32(&src[0x32]); - _ptr = state._curLibPtr->getBoltEntryFromLong(ptrId)._data; + state._curLibPtr->resolveIt(ptrId, &_ptr); for (int i = 0; i < 8; ++i) _memberIds[i] = READ_LE_UINT16(src + i * 2); diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 0c0e9aba9e..a437f012c7 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -543,7 +543,7 @@ void ThreadResource::parsePlayCommands() { if (_vm->_iForceDeath == -1) { int randomVal; do { - randomVal = _vm->getRandomNumber(3); + randomVal = _vm->getRandomNumber(3) + 1; } while (randomVal == _vm->_voy._field4380); _vm->_voy._field4380 = randomVal; |