[Scummvm-cvs-logs] scummvm master -> c1102af1c32c0fca4c77980d1da9f04592ac1508

[m-kiewitz]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c1102af1c3 SHERLOCK: 3DO: object loading: fix _use loading


Commit: c1102af1c32c0fca4c77980d1da9f04592ac1508
    https://github.com/scummvm/scummvm/commit/c1102af1c32c0fca4c77980d1da9f04592ac1508
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-13T17:41:10+02:00

Commit Message:
SHERLOCK: 3DO: object loading: fix _use loading

fixes murder scene room crash

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a1fef8f..9005235 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);