From ae7bb13f20889c402b55f7d9ef55223b3437da06 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 11 Dec 2013 22:36:40 -0500
Subject: VOYEUR: Fix loading of ControlResource

---
 engines/voyeur/files.cpp         | 2 +-
 engines/voyeur/files_threads.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3