diff options
author | Johannes Schickel | 2009-12-07 16:21:33 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-12-07 16:21:33 +0000 |
commit | babb38230e4cd69aaf79d0ade25a1cf37f6815bb (patch) | |
tree | fe835eb6df4f0cad6b24c76eaf38d150da44c839 /engines | |
parent | 920df7a3b5d0daea68240383e05dc841774745ad (diff) | |
download | scummvm-rg350-babb38230e4cd69aaf79d0ade25a1cf37f6815bb.tar.gz scummvm-rg350-babb38230e4cd69aaf79d0ade25a1cf37f6815bb.tar.bz2 scummvm-rg350-babb38230e4cd69aaf79d0ade25a1cf37f6815bb.zip |
Hopefully silencing C4121 in MSVC.
svn-id: r46278
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/kyra_hof.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index c1278128d2..af3c065d8e 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -119,21 +119,21 @@ class TextDisplayer_HoF; struct TIM; -typedef int (KyraEngine_HoF::*SeqProc)(WSAMovie_v2*, int, int, int); +typedef int (KyraEngine_HoF::*SeqProc)(WSAMovie_v2 *, int, int, int); struct ActiveWSA { - int16 flags; + SeqProc callback; WSAMovie_v2 *movie; + const FrameControl *control; + int16 flags; uint16 startFrame; uint16 endFrame; uint16 frameDelay; - SeqProc callback; uint32 nextFrame; uint16 currentFrame; uint16 lastFrame; uint16 x; uint16 y; - const FrameControl *control; uint16 startupCommand; uint16 finalCommand; }; @@ -142,16 +142,16 @@ struct ActiveText { uint16 strIndex; uint16 x; uint16 y; - int duration; uint16 width; + int32 duration; uint32 startTime; int16 textcolor; }; struct Sequence { + const char *wsaFile; + const char *cpsFile; uint16 flags; - const char * wsaFile; - const char * cpsFile; uint8 startupCommand; uint8 finalCommand; int16 stringIndex1; @@ -165,14 +165,14 @@ struct Sequence { }; struct NestedSequence { + const char *wsaFile; + const FrameControl *wsaControl; uint16 flags; - const char * wsaFile; uint16 startframe; uint16 endFrame; uint16 frameDelay; uint16 x; uint16 y; - const FrameControl *wsaControl; uint16 startupCommand; uint16 finalCommand; }; |