1 files changed, 23 insertions, 15 deletions

diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 1a24c5a576..5f2452dcfe 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -409,7 +409,7 @@ static uint32 *getSelectList(uint32 i) {
 			sl[k++] = dialog->_choice[i]._select[j]._dwData;
 	}
 
-	sl[k] = (uint32)NULL;
+	sl[k] = 0;
 	return sl;
 }
 
@@ -436,7 +436,7 @@ static uint32 *GetItemList(uint32 nLoc) {
 		}
 	}
 
-	il[j] = (uint32)NULL;
+	il[j] = 0;
 	return il;
 }
 
@@ -521,14 +521,15 @@ static LpItem getItemData(uint32 nOrdItem) {
 		dat += dim;
 	}
 
-	// Check if we've got to the end of the file
 	int i = READ_LE_UINT16(dat);
-	if (i != 0xABCD)
-		return NULL;
 
 	globalUnlock(hDat);
 	globalFree(hDat);
 
+	// Check if we've got to the end of the file
+	if (i != 0xABCD)
+		return NULL;
+
 	return ret;
 }
 
@@ -831,7 +832,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 		if (_ctx->k == 0)
 			// We can remove this item from the list
-			_ctx->il[_ctx->i] = (uint32)NULL;
+			_ctx->il[_ctx->i] = 0;
 		else
 			_ctx->nRealItems++;
 	}
@@ -1875,14 +1876,11 @@ MpalHandle mpalQueryHANDLE(uint16 wQueryType, ...) {
  * @remarks		This is the specialised version of the original single mpalQuery
  * method that needs to run within a co-routine context.
  */
-void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) {
+void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet) {
 	CORO_BEGIN_CONTEXT;
 		uint32 dwRet;
 	CORO_END_CONTEXT(_ctx);
 
-	va_list v;
-	va_start(v, dwRet);
-
 	CORO_BEGIN_CODE(_ctx);
 
 	if (wQueryType == MPQ_DIALOG_WAITFORCHOICE) {
@@ -1908,8 +1906,6 @@ void mpalQueryCORO(CORO_PARAM, uint16 wQueryType, uint32 *dwRet, ...) {
 	}
 
 	CORO_END_CODE;
-
-	va_end(v);
 }
 
 /**
@@ -1939,7 +1935,7 @@ bool mpalExecuteScript(int nScript) {
 
 	// !!! New process management
 	if (CoroScheduler.createProcess(ScriptThread, &s, sizeof(LpMpalScript)) == CORO_INVALID_PID_VALUE)
- 		return false;
+		return false;
 
 	return true;
 }
@@ -2039,7 +2035,13 @@ int mpalGetSaveStateSize() {
 void mpalSaveState(byte *buf) {
 	lockVar();
 	WRITE_LE_UINT32(buf, GLOBALS._nVars);
-	memcpy(buf + 4, (byte *)GLOBALS._lpmvVars, GLOBALS._nVars * sizeof(MpalVar));
+	buf += 4;
+	for (uint i = 0; i < GLOBALS._nVars; ++i) {
+		LpMpalVar var = &GLOBALS._lpmvVars[i];
+		WRITE_LE_UINT32(buf, var->_dwVal);
+		memcpy(buf + 4, var->_lpszVarName, sizeof(var->_lpszVarName));
+		buf += (4 + sizeof(var->_lpszVarName));
+	}
 	unlockVar();
 }
 
@@ -2054,10 +2056,16 @@ int mpalLoadState(byte *buf) {
 	globalFree(GLOBALS._hVars);
 
 	GLOBALS._nVars = READ_LE_UINT32(buf);
+	buf += 4;
 
 	GLOBALS._hVars = globalAllocate(GMEM_ZEROINIT | GMEM_MOVEABLE, GLOBALS._nVars * sizeof(MpalVar));
 	lockVar();
-	memcpy((byte *)GLOBALS._lpmvVars, buf + 4, GLOBALS._nVars * sizeof(MpalVar));
+	for (uint i = 0; i < GLOBALS._nVars; ++i) {
+		LpMpalVar var = &GLOBALS._lpmvVars[i];
+		var->_dwVal = READ_LE_UINT32(buf);
+		memcpy(var->_lpszVarName, buf + 4, sizeof(var->_lpszVarName));
+		buf += (4 + sizeof(var->_lpszVarName));
+	}
 	unlockVar();
 
 	return GLOBALS._nVars * sizeof(MpalVar) + 4;