[Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.62,1.63 script.cpp,1.73,1.74 sthread.cpp,1.96,1.97

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24872

Modified Files:
	events.cpp script.cpp sthread.cpp 
Log Message:
Fix bug #1252277 "ITE: Actions not performed under OS X"


Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- events.cpp	29 Jul 2005 17:57:40 -0000	1.62
+++ events.cpp	8 Aug 2005 19:40:54 -0000	1.63
@@ -417,10 +417,10 @@
 				break;
 			}
 
-			sthread->_threadVars[kThreadVarAction] = TO_LE_16(event->param3);
-			sthread->_threadVars[kThreadVarObject] = TO_LE_16(event->param4);
-			sthread->_threadVars[kThreadVarWithObject] = TO_LE_16(event->param5);
-			sthread->_threadVars[kThreadVarActor] = TO_LE_16(event->param6);
+			sthread->_threadVars[kThreadVarAction] = event->param3;
+			sthread->_threadVars[kThreadVarObject] = event->param4;
+			sthread->_threadVars[kThreadVarWithObject] = event->param5;
+			sthread->_threadVars[kThreadVarActor] = event->param6;
 
 			if (event->op == EVENT_EXEC_BLOCKING)
 				_vm->_script->completeThread();

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- script.cpp	8 Aug 2005 08:15:16 -0000	1.73
+++ script.cpp	8 Aug 2005 19:40:55 -0000	1.74
@@ -414,6 +414,7 @@
 		} else {
 			if (objectType & (kGameObjectActor | kGameObjectObject)) {
 				scriptEntrypointNumber = _vm->_actor->getObjectScriptEntrypointNumber(_pendingObject[0]);
+				debug(0, "%d", scriptEntrypointNumber);
 
 				if ((objectType == kGameObjectActor) && !(_vm->_actor->getObjectFlags(_pendingObject[0]) & (kFollower|kProtagonist|kExtended))) {
 					scriptModuleNumber = _vm->_scene->getScriptModuleNumber();

Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- sthread.cpp	7 Aug 2005 00:00:43 -0000	1.96
+++ sthread.cpp	8 Aug 2005 19:40:55 -0000	1.97
@@ -266,8 +266,10 @@
 			thread->push((*addr) & iparam1 ? 1 : 0);
 			break;
 		CASEOP(opGetInt)
-			addr = thread->baseAddress(scriptS.readByte());
+			iparam2 = scriptS.readByte();
+			addr = thread->baseAddress(iparam2);
 			iparam1 = scriptS.readSint16LE();
+			debug(0, "%d %d %d", *((uint16*)addr), iparam2, iparam1);
 			addr += iparam1;
 			thread->push(*((uint16*)addr));
 			debug(8, "0x%X", *((uint16*)addr));