[Scummvm-git-logs] scummvm master -> bb45f57556e4800aacb81aec8f0c4a24f6521b34

dreammaster noreply at scummvm.org
Wed Jan 10 02:49:22 UTC 2024


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:
bb45f57556 M4: Fix basic walk animation on 64-bit builds


Commit: bb45f57556e4800aacb81aec8f0c4a24f6521b34
    https://github.com/scummvm/scummvm/commit/bb45f57556e4800aacb81aec8f0c4a24f6521b34
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-01-09T18:49:09-08:00

Commit Message:
M4: Fix basic walk animation on 64-bit builds

Changed paths:
    engines/m4/wscript/ws_cruncher.cpp


diff --git a/engines/m4/wscript/ws_cruncher.cpp b/engines/m4/wscript/ws_cruncher.cpp
index 04a92ab579a..7cbe40badf1 100644
--- a/engines/m4/wscript/ws_cruncher.cpp
+++ b/engines/m4/wscript/ws_cruncher.cpp
@@ -390,7 +390,7 @@ bool ws_ResumeAnim8(Anim8 *myAnim8) {
 static bool ExtractArg(Anim8 *myAnim8, int32 myFormat, int32 myData, frac16 **argPtr, frac16 *argValue) {
 	int32 myIndex;
 	Anim8 *parentAnim8;
-	frac16 *dataArray;
+	uint32 *dataArray;
 
 	// If the format indicates the argument is a local source (parent, register, or data)
 	if (myFormat == FMT_LOCAL_SRC) {
@@ -443,10 +443,10 @@ static bool ExtractArg(Anim8 *myAnim8, int32 myFormat, int32 myData, frac16 **ar
 			}
 
 			// Dereferrence the dataHandle, add the offset to find the array of data for this anim8
-			dataArray = (frac16 *)((intptr)*(myAnim8->dataHandle) + myAnim8->dataOffset);
+			dataArray = (uint32 *)((intptr)*(myAnim8->dataHandle) + myAnim8->dataOffset);
 
 			// Copy the data field into dataArg1, and set myArg1 to point to this location
-			*argValue = dataArray[myIndex];
+			*argValue = FROM_LE_32(dataArray[myIndex]);
 			*argPtr = argValue;
 			break;
 		}




More information about the Scummvm-git-logs mailing list