[Scummvm-git-logs] scummvm master -> 42bdadaed6d075a001dcf31023411dd5bacfff88

dreammaster noreply at scummvm.org
Sun May 26 02:50:19 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:
42bdadaed6 M4: Endian fix for script interpreter. Demo now gets in-game on BE systems


Commit: 42bdadaed6d075a001dcf31023411dd5bacfff88
    https://github.com/scummvm/scummvm/commit/42bdadaed6d075a001dcf31023411dd5bacfff88
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-25T19:50:03-07:00

Commit Message:
M4: Endian fix for script interpreter. Demo now gets in-game on BE systems

Changed paths:
    engines/m4/wscript/ws_load.cpp
    engines/m4/wscript/ws_machine.cpp


diff --git a/engines/m4/wscript/ws_load.cpp b/engines/m4/wscript/ws_load.cpp
index 611d6eb40df..801152b5515 100644
--- a/engines/m4/wscript/ws_load.cpp
+++ b/engines/m4/wscript/ws_load.cpp
@@ -1506,6 +1506,7 @@ static int32 GetSSHeaderInfo(SysFile *sysFile, uint32 **data, RGB8 *myPalette) {
 	uint32 *tempPtr, i, j, header, format;
 	int32 numCels, dataOffset;
 	bool byteSwap;
+	void *handlebuffer;
 
 	if (!sysFile) {
 		ws_LogErrorMsg(FL, "nullptr FILE POINTER given.");
diff --git a/engines/m4/wscript/ws_machine.cpp b/engines/m4/wscript/ws_machine.cpp
index 581eeebebd4..ef56e583385 100644
--- a/engines/m4/wscript/ws_machine.cpp
+++ b/engines/m4/wscript/ws_machine.cpp
@@ -960,7 +960,7 @@ void IntoTheState(machine *m) {
 	}
 
 	stateTable = (uint32 *)((intptr)(*(m->machHandle)) + (intptr)m->stateTableOffset);
-	pcOffset = stateTable[m->curState];
+	pcOffset = FROM_LE_32(stateTable[m->curState]);
 
 	// Increment and remember the recurseLevel and the machine ID
 	m->recurseLevel++;




More information about the Scummvm-git-logs mailing list