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

joostp at users.sourceforge.net joostp at users.sourceforge.net
Fri Jul 25 12:20:05 CEST 2008


Revision: 33285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33285&view=rev
Author:   joostp
Date:     2008-07-25 10:20:05 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
change PPINIT struct to use ScummVM datatypes, so sizeof(PPINIT) is 28 on ppc/OSX as well.

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

Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp	2008-07-25 09:37:47 UTC (rev 33284)
+++ scummvm/trunk/engines/tinsel/play.cpp	2008-07-25 10:20:05 UTC (rev 33285)
@@ -93,18 +93,18 @@
 
 struct PPINIT {
 	SCNHANDLE hFilm;	// The 'film'
-	short	x;			// } Co-ordinates from the play()
-	short	y;			// } - set to (-1, -1) if none.
-	short	z;			// normally 0, set if from restore
-	short	speed;		// Film speed
-	short 	actorid;	// Set if called from an actor code block
-	bool	splay;		// Set if called from splay()
-	bool	bTop;		// Set if called from topplay()
-	short	sf;			// SlowFactor - only used for moving actors
-	short	column;		// Column number, first column = 0
+	int16	x;			// } Co-ordinates from the play()
+	int16	y;			// } - set to (-1, -1) if none.
+	int16	z;			// normally 0, set if from restore
+	int16	speed;		// Film speed
+	int16 	actorid;	// Set if called from an actor code block
+	uint8	splay;		// Set if called from splay()
+	uint8	bTop;		// Set if called from topplay()
+	int16	sf;			// SlowFactor - only used for moving actors
+	int16	column;		// Column number, first column = 0
 
-	bool	escOn;
-	int	myescEvent;
+	uint8	escOn;
+	int32	myescEvent;
 };
 
 
@@ -417,7 +417,7 @@
 		newestFilm(film, &pfilm->reels[i]);
 
 		ppi.column = i;
-		g_scheduler->createProcess(PID_REEL, playProcess, &ppi, sizeof(ppi));
+		g_scheduler->createProcess(PID_REEL, playProcess, &ppi, sizeof(PPINIT));
 	}
 }
 


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




More information about the Scummvm-git-logs mailing list