[Scummvm-cvs-logs] SF.net SVN: scummvm:[46278] scummvm/trunk/engines/kyra/kyra_hof.h

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Dec 7 17:21:33 CET 2009


Revision: 46278
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46278&view=rev
Author:   lordhoto
Date:     2009-12-07 16:21:33 +0000 (Mon, 07 Dec 2009)

Log Message:
-----------
Hopefully silencing C4121 in MSVC.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_hof.h

Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h	2009-12-07 15:34:27 UTC (rev 46277)
+++ scummvm/trunk/engines/kyra/kyra_hof.h	2009-12-07 16:21:33 UTC (rev 46278)
@@ -119,21 +119,21 @@
 
 struct TIM;
 
-typedef int (KyraEngine_HoF::*SeqProc)(WSAMovie_v2*, int, int, int);
+typedef int (KyraEngine_HoF::*SeqProc)(WSAMovie_v2 *, int, int, int);
 
 struct ActiveWSA {
+	SeqProc callback;
+	WSAMovie_v2 *movie;
+	const FrameControl *control;
 	int16 flags;
-	WSAMovie_v2 *movie;
 	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 @@
 	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 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;
 };


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