From c1102af1c32c0fca4c77980d1da9f04592ac1508 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 13 Jun 2015 17:41:10 +0200
Subject: SHERLOCK: 3DO: object loading: fix _use loading

fixes murder scene room crash
---
 engines/sherlock/objects.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'engines/sherlock/objects.cpp')

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a1fef8f8ec..9005235d5a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -766,17 +766,12 @@ void Object::load3DO(Common::SeekableReadStream &s) {
 	s.skip(2); // boundary filler
 
 	// 288 bytes
-	_use[0].load3DO(s);
-	s.skip(2); // Filler
-	_use[1].load3DO(s);
-	s.skip(2); // Filler
-	_use[2].load3DO(s);
-	// no filler after 3rd entry
-	_use[3].load3DO(s);
-	s.skip(2); // Filler
+	for (int idx = 0; idx < 4; ++idx) {
+		_use[idx].load3DO(s);
+		s.skip(2); // Filler
+	}
 
 	// 158 bytes
-	s.skip(2); // Filler
 	_aOpen.load(s); // 2 + 12*4 bytes = 50 bytes
 	s.skip(2); // Boundary filler
 	_aClose.load(s);
-- 
cgit v1.2.3