From 7f018dafd5e56285e40d834de17447de3894a148 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 11 Dec 2013 22:20:48 -0500
Subject: VOYEUR: Bugfixes for getField1CE method

---
 engines/voyeur/files_threads.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index dc9d014992..0c0e9aba9e 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -169,10 +169,11 @@ void ThreadResource::getButtonsFlags() {
 void ThreadResource::getField1CE() {
 	int idx = 0;
 	
-	for (const byte *p = _field4A; *p != 0x49; p = getNextRecord(p)) {
+	for (const byte *p = _field4A; *p++ != 0x49; p = getNextRecord(p)) {
 		assert(idx < 47);
 		_field1CE[idx++] = getRecordOffset(p);
 		_field1CE[idx] = NULL;
+		p += 4;
 	}
 }
 
@@ -199,7 +200,7 @@ void ThreadResource::initUseCount() {
 }
 
 const byte *ThreadResource::getRecordOffset(const byte *p) {
-	uint32 recSize = READ_LE_UINT32(p) + READ_LE_UINT32(p + 6);
+	uint32 recSize = READ_LE_UINT32(p) + READ_LE_UINT32(_ctlPtr + 6);
 	return _ctlPtr + recSize;
 }
 
-- 
cgit v1.2.3