[Scummvm-git-logs] scummvm master -> 4a5d11bcbac6b88185fd2c9e3648b08ff09bb072

moralrecordings code at moral.net.au
Sat Mar 21 16:09:49 UTC 2020


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:
4a5d11bcba DIRECTOR: When loading cast strings, only skip first byte for name


Commit: 4a5d11bcbac6b88185fd2c9e3648b08ff09bb072
    https://github.com/scummvm/scummvm/commit/4a5d11bcbac6b88185fd2c9e3648b08ff09bb072
Author: Scott Percival (code at moral.net.au)
Date: 2020-03-22T00:09:07+08:00

Commit Message:
DIRECTOR: When loading cast strings, only skip first byte for name

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 58488242bd..b0a11f8ae1 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1370,7 +1370,9 @@ Common::Array<Common::String> Score::loadStrings(Common::SeekableSubReadStreamEn
 	for (uint16 i = 0; i < count - 1; i++) {
 		Common::String entryString;
 
-		for (uint j = entries[i] + 1; j < entries[i + 1]; j++) // Skip first byte which is string length
+		uint start = i == 1 ? entries[i] + 1 : entries[i]; // Skip first byte which is string length
+
+		for (uint j = start; j < entries[i + 1]; j++)
 			if (data[j] == '\r')
 				entryString += '\n';
 			else if (data[j] >= 0x20)




More information about the Scummvm-git-logs mailing list