[Scummvm-cvs-logs] SF.net SVN: scummvm:[48534] scummvm/trunk/engines/tinsel

[lordhoto at users.sourceforge.net]

Revision: 48534
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48534&view=rev
Author:   lordhoto
Date:     2010-04-05 07:22:34 +0000 (Mon, 05 Apr 2010)

Log Message:
-----------
Commit of the updated version of Fingolfin's patch for bug #2981788 "TINSEL: Build with -O2 broken".

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/play.cpp
    scummvm/trunk/engines/tinsel/sched.cpp

Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp	2010-04-05 06:07:14 UTC (rev 48533)
+++ scummvm/trunk/engines/tinsel/play.cpp	2010-04-05 07:22:34 UTC (rev 48534)
@@ -376,10 +376,9 @@
 	CORO_END_CODE;
 }
 
-static void ResSoundReel(CORO_PARAM, const void *) {
+static void ResSoundReel(CORO_PARAM, const void *param) {
 	// get the stuff copied to process when it was created
-	PPROCESS pProc = g_scheduler->getCurrentProcess();
-	int	i = *(int *)pProc->param;
+	int i = *(const int *)param;
 
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);

Modified: scummvm/trunk/engines/tinsel/sched.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sched.cpp	2010-04-05 06:07:14 UTC (rev 48533)
+++ scummvm/trunk/engines/tinsel/sched.cpp	2010-04-05 07:22:34 UTC (rev 48534)
@@ -508,21 +508,18 @@
 /**
  * The code for for restored scene processes.
  */
-static void RestoredProcessProcess(CORO_PARAM, const void *) {
+static void RestoredProcessProcess(CORO_PARAM, const void *param) {
 	CORO_BEGIN_CONTEXT;
 		INT_CONTEXT *pic;
 	CORO_END_CONTEXT(_ctx);
 
 	CORO_BEGIN_CODE(_ctx);
 
-	PROCESS *pProc;		// this process pointer
-
 	// get the stuff copied to process when it was created
-	pProc = g_scheduler->getCurrentProcess();
-	_ctx->pic = *((INT_CONTEXT **) pProc->param);
+	_ctx->pic = *(const PINT_CONTEXT *)param;
 
 	_ctx->pic = RestoreInterpretContext(_ctx->pic);
-	AttachInterpret(_ctx->pic, pProc);
+	AttachInterpret(_ctx->pic, g_scheduler->getCurrentProcess());
 
 	CORO_INVOKE_1(Interpret, _ctx->pic);
 
@@ -532,9 +529,8 @@
 /**
  * Process Tinsel Process
  */
-static void ProcessTinselProcess(CORO_PARAM, const void *) {
-	PPROCESS pProc = g_scheduler->getCurrentProcess();
-	PINT_CONTEXT *pPic = (PINT_CONTEXT *) pProc->param;
+static void ProcessTinselProcess(CORO_PARAM, const void *param) {
+	const PINT_CONTEXT *pPic = (const PINT_CONTEXT *)param;
 
 	CORO_BEGIN_CONTEXT;
 	CORO_END_CONTEXT(_ctx);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.