From babb38230e4cd69aaf79d0ade25a1cf37f6815bb Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 7 Dec 2009 16:21:33 +0000
Subject: Hopefully silencing C4121 in MSVC.

svn-id: r46278
---
 engines/kyra/kyra_hof.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/kyra')

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;
 };
-- 
cgit v1.2.3