[Scummvm-cvs-logs] scummvm master -> 46a49849ccfbcf18148c21ba9e81d4f956cab9bb

m-kiewitz m_kiewitz at users.sourceforge.net
Fri Jun 12 23:59:15 CEST 2015


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:
46a49849cc SHERLOCK: 3DO: fix object loading of open action


Commit: 46a49849ccfbcf18148c21ba9e81d4f956cab9bb
    https://github.com/scummvm/scummvm/commit/46a49849ccfbcf18148c21ba9e81d4f956cab9bb
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-12T23:59:29+02:00

Commit Message:
SHERLOCK: 3DO: fix object loading of open action

fixes door being locked in first room

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b4310af..27bbb39 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -764,8 +764,8 @@ void Object::load3DO(Common::SeekableReadStream &s) {
 	s.skip(2); // Filler
 
 	// 158 bytes
-	_aOpen.load(s); // 2 + 12*4 bytes = 50 bytes
 	s.skip(2); // Filler
+	_aOpen.load(s); // 2 + 12*4 bytes = 50 bytes
 	s.skip(2); // Boundary filler
 	_aClose.load(s);
 	s.skip(2); // Filler






More information about the Scummvm-git-logs mailing list