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

[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:
fc5bd36d5e SHERLOCK: 3DO: object._maxFrames found in objdata


Commit: fc5bd36d5e853753321d89d047c69e2bcf9f57bc
    https://github.com/scummvm/scummvm/commit/fc5bd36d5e853753321d89d047c69e2bcf9f57bc
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-12T14:53:18+02:00

Commit Message:
SHERLOCK: 3DO: object._maxFrames found in objdata

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 19561f6..d135c20 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -729,8 +729,6 @@ void Object::load3DO(Common::SeekableReadStream &s) {
 	_goto.x = _goto.x * FIXED_INT_MULTIPLIER / 100;
 	_goto.y = _goto.y * FIXED_INT_MULTIPLIER / 100;
 
-	s.skip(16); // Unknown
-
 #if 0
 	_pickup = s.readByte();
 	_defaultCommand = s.readByte();
@@ -759,11 +757,15 @@ void Object::load3DO(Common::SeekableReadStream &s) {
 #endif
 	warning("pos %d", s.pos());
 
+	s.skip(13); // Unknown
+	_maxFrames = s.readByte();
+	s.skip(2); // Unknown
+
 	_descOffset = s.readUint16BE();
 	_seqCounter2 = 0; // ???
 	_seqSize = s.readUint16BE();
 
-	s.skip(446);
+	s.skip(446); // Unknown
 
 #if 0
 	s.skip(1);