Paranoid fix for potential 64bit issue; some possibly useful debug output added

svn-id: r13474

1 files changed, 8 insertions, 4 deletions

diff --git a/scumm/script.cpp b/scumm/script.cpp
index 2db41d7a9c..2a93b3bbe7 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -429,7 +429,7 @@ void ScummEngine::executeScript() {
 
 byte ScummEngine::fetchScriptByte() {
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
-		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
+		long oldoffs = _scriptPointer - _scriptOrgPointer;
 		getScriptBaseAddress();
 		_scriptPointer = _scriptOrgPointer + oldoffs;
 	}
@@ -439,7 +439,7 @@ byte ScummEngine::fetchScriptByte() {
 uint ScummEngine::fetchScriptWord() {
 	int a;
 	if (*_lastCodePtr + sizeof(MemBlkHeader) != _scriptOrgPointer) {
-		uint32 oldoffs = _scriptPointer - _scriptOrgPointer;
+		long oldoffs = _scriptPointer - _scriptOrgPointer;
 		getScriptBaseAddress();
 		_scriptPointer = _scriptOrgPointer + oldoffs;
 	}
@@ -540,6 +540,8 @@ int ScummEngine::readVar(uint var) {
 }
 
 void ScummEngine::writeVar(uint var, int value) {
+	debugC(DEBUG_VARS, "writeVar(%d, %d)", var, value);
+
 	if (!(var & 0xF000)) {
 		checkRange(_numVariables - 1, 0, var, "Variable %d out of range(w)");
 
@@ -630,6 +632,7 @@ void ScummEngine::setResult(int value) {
 
 void ScummEngine::push(int a) {
 	assert(_scummStackPos >= 0 && _scummStackPos < ARRAYSIZE(_vmStack));
+	//debug(9, "push %d", a);
 	_vmStack[_scummStackPos++] = a;
 }
 
@@ -637,8 +640,9 @@ int ScummEngine::pop() {
 	if (_scummStackPos < 1 || _scummStackPos > ARRAYSIZE(_vmStack)) {
 		error("No items on stack to pop() for %s (0x%X) at [%d-%d]", getOpcodeDesc(_opcode), _opcode, _roomResource, vm.slot[_currentScript].number);
 	}
-
-	return _vmStack[--_scummStackPos];
+	--_scummStackPos;
+	//debug(9, "pop %d", _vmStack[_scummStackPos]);
+	return _vmStack[_scummStackPos];
 }
 
 void ScummEngine::stopObjectCode() {