aboutsummaryrefslogtreecommitdiff
path: root/engines/tinsel
diff options
context:
space:
mode:
authorJoost Peters2008-07-25 10:20:05 +0000
committerJoost Peters2008-07-25 10:20:05 +0000
commit71d40e23f5fff8557283726fb0563a79e6ba7a9c (patch)
treed544be3daba1c05f9cab519379bc0ab90a9f103f /engines/tinsel
parentba351015cbbdbfd75235996cfa4f177442448bba (diff)
downloadscummvm-rg350-71d40e23f5fff8557283726fb0563a79e6ba7a9c.tar.gz
scummvm-rg350-71d40e23f5fff8557283726fb0563a79e6ba7a9c.tar.bz2
scummvm-rg350-71d40e23f5fff8557283726fb0563a79e6ba7a9c.zip
change PPINIT struct to use ScummVM datatypes, so sizeof(PPINIT) is 28 on ppc/OSX as well.
svn-id: r33285
Diffstat (limited to 'engines/tinsel')
-rw-r--r--engines/tinsel/play.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index 90fa51d6fc..e32fc88d3d 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -93,18 +93,18 @@ int32 NoNameFunc(int actorID, bool bNewMover) {
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
-
- bool escOn;
- int myescEvent;
+ 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
+
+ uint8 escOn;
+ int32 myescEvent;
};
@@ -417,7 +417,7 @@ void playFilm(SCNHANDLE film, int x, int y, int actorid, bool splay, int sfact,
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));
}
}