[Scummvm-cvs-logs] scummvm master -> 848b0d1b0be8719c8b690eb59a969821ab1a280d

fuzzie fuzzie at fuzzie.org
Wed Apr 13 19:13:50 CEST 2011


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:
848b0d1b0b MOHAWK: Stupid padding fix.


Commit: 848b0d1b0be8719c8b690eb59a969821ab1a280d
    https://github.com/scummvm/scummvm/commit/848b0d1b0be8719c8b690eb59a969821ab1a280d
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-04-13T10:12:25-07:00

Commit Message:
MOHAWK: Stupid padding fix.

Changed paths:
    engines/mohawk/livingbooks.cpp



diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 556210c..7f6c3cc 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -1997,13 +1997,14 @@ LBScriptEntry *LBItem::parseScriptEntry(uint16 type, uint16 &size, Common::Seeka
 			debug(4, "%d targets with targeting type %04x", count, targetingType);
 
 			// FIXME: targeting by name
+			uint oldAlign = size % 2;
 			for (uint i = 0; i < count; i++) {
 				Common::String target = _vm->readString(stream);
 				warning("ignoring target '%s' in script entry", target.c_str());
 				size -= target.size() + 1;
 			}
 
-			if (size % 2 == 1) {
+			if (size % 2 != oldAlign) {
 				stream->skip(1);
 				size--;
 			}






More information about the Scummvm-git-logs mailing list