[Scummvm-cvs-logs] scummvm master -> 17b3dc4584ab2f01d3109c13cf202db6d9532c5e

[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:
17b3dc4584 SCI: Fix script patcher, so that it works on BE systems


Commit: 17b3dc4584ab2f01d3109c13cf202db6d9532c5e
    https://github.com/scummvm/scummvm/commit/17b3dc4584ab2f01d3109c13cf202db6d9532c5e
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-07-01T15:23:50+02:00

Commit Message:
SCI: Fix script patcher, so that it works on BE systems

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



diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 1302cc9..13c3297 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -4138,7 +4138,7 @@ int32 ScriptPatcher::findSignature(const SciScriptPatcherEntry *patchEntry, cons
 	return findSignature(runtimeEntry->magicDWord, runtimeEntry->magicOffset, patchEntry->signatureData, patchEntry->description, scriptData, scriptSize);
 }
 
-// Attention: Magic DWord is returns using platform specific byte order. This is done on purpose for performance.
+// Attention: Magic DWord is returned using platform specific byte order. This is done on purpose for performance.
 void ScriptPatcher::calculateMagicDWordAndVerify(const char *signatureDescription, const uint16 *signatureData, bool magicDWordIncluded, uint32 &calculatedMagicDWord, int &calculatedMagicDWordOffset) {
 	Selector curSelector = -1;
 	int magicOffset;
@@ -4219,7 +4219,7 @@ void ScriptPatcher::calculateMagicDWordAndVerify(const char *signatureDescriptio
 				}
 				if (!magicDWordLeft) {
 					// Magic DWORD is now known, convert to platform specific byte order
-					calculatedMagicDWord = READ_LE_UINT32(magicDWord);
+					calculatedMagicDWord = READ_UINT32(magicDWord);
 				}
 			}
 			break;
@@ -4244,7 +4244,8 @@ void ScriptPatcher::calculateMagicDWordAndVerify(const char *signatureDescriptio
 				magicDWord[4 - magicDWordLeft] = (byte)curValue;
 				magicDWordLeft--;
 				if (!magicDWordLeft) {
-					calculatedMagicDWord = READ_LE_UINT32(magicDWord);
+					// Magic DWORD is now known, convert to platform specific byte order
+					calculatedMagicDWord = READ_UINT32(magicDWord);
 				}
 			}
 			break;