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

m-kiewitz m_kiewitz at users.sourceforge.net
Mon Jun 15 22:12:52 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:
ed521acd8c SHERLOCK: loadScene: properly reset cAnimOffsetTab


Commit: ed521acd8c03a5b4704cc109f63a0dc70f291866
    https://github.com/scummvm/scummvm/commit/ed521acd8c03a5b4704cc109f63a0dc70f291866
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-15T22:12:58+02:00

Commit Message:
SHERLOCK: loadScene: properly reset cAnimOffsetTab

Changed paths:
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 3f19447..9017b70 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -500,7 +500,7 @@ bool Scene::loadScene(const Common::String &filename) {
 				// Load cAnim offset table as well
 				uint32 *cAnimOffsetTablePtr = new uint32[bgHeader._numcAnimations];
 				uint32 *cAnimOffsetPtr = cAnimOffsetTablePtr;
-				memset(cAnimOffsetTablePtr, 0, bgHeader._numcAnimations);
+				memset(cAnimOffsetTablePtr, 0, bgHeader._numcAnimations * sizeof(uint32));
  				if (IS_SERRATED_SCALPEL) {
 					// Save current stream offset
 					int32 curOffset = rrmStream->pos();
@@ -770,7 +770,7 @@ bool Scene::loadScene(const Common::String &filename) {
 
 			uint32 *cAnimOffsetTablePtr = new uint32[header3DO_numAnimations];
 			uint32 *cAnimOffsetPtr = cAnimOffsetTablePtr;
-			memset(cAnimOffsetTablePtr, 0, header3DO_numAnimations);
+			memset(cAnimOffsetTablePtr, 0, header3DO_numAnimations * sizeof(uint32));
 
 			// Seek to end of graphics data and load cAnim offset table from there
 			roomStream->seek(header3DO_bgGraphicData_offset + header3DO_bgGraphicData_size);






More information about the Scummvm-git-logs mailing list