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

m-kiewitz m_kiewitz at users.sourceforge.net
Mon May 4 21:51:11 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:
f1a75991ed SCI: fix bug in new string identifying code


Commit: f1a75991edcb810c8034af8d797f5fc139c9be57
    https://github.com/scummvm/scummvm/commit/f1a75991edcb810c8034af8d797f5fc139c9be57
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-05-04T21:50:42+02:00

Commit Message:
SCI: fix bug in new string identifying code

fixes string identifying in mac SCI1.1 games

Changed paths:
    engines/sci/engine/script.cpp



diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 70e5588..69f5249 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -274,7 +274,7 @@ void Script::identifyStrings() {
 					listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
 					// now look for terminating [NUL]
 					do {
-						stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+						stringDataByte = *stringDataPtr;
 						stringDataPtr++;
 						stringDataLeft--;
 						if (!stringDataByte) // NUL found, exit this loop
@@ -356,7 +356,7 @@ void Script::identifyStrings() {
 			listEntry.ptrOffset = stringStartPtr - _buf; // Calculate offset inside script data
 			// now look for terminating [NUL]
 			do {
-				stringDataByte = READ_SCI11ENDIAN_UINT16(stringDataPtr);
+				stringDataByte = *stringDataPtr;
 				stringDataPtr++;
 				stringDataLeft--;
 				if (!stringDataByte) // NUL found, exit this loop






More information about the Scummvm-git-logs mailing list