[Scummvm-cvs-logs] SF.net SVN: scummvm:[45828] scummvm/trunk/engines/m4/mads_anim.h

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Wed Nov 11 10:56:29 CET 2009


Revision: 45828
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45828&view=rev
Author:   dreammaster
Date:     2009-11-11 09:56:29 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
Beginnings of support for AA file animations. The mads_anim.cpp commit is part of this, not the previous commit

Modified Paths:
--------------
    scummvm/trunk/engines/m4/mads_anim.h

Modified: scummvm/trunk/engines/m4/mads_anim.h
===================================================================
--- scummvm/trunk/engines/m4/mads_anim.h	2009-11-11 09:55:05 UTC (rev 45827)
+++ scummvm/trunk/engines/m4/mads_anim.h	2009-11-11 09:56:29 UTC (rev 45828)
@@ -27,6 +27,7 @@
 #define M4_MADS_ANIM_H
 
 #include "m4/viewmgr.h"
+#include "m4/compression.h"
 
 namespace M4 {
 
@@ -86,13 +87,31 @@
 
 typedef void (*AnimviewCallback)(M4Engine *vm);
 
+class AAFile: public MadsPack {
+public:
+	AAFile(const char *resourceName, M4Engine* vm);
+
+	uint16 seriesCount;
+	uint16 frameCount;
+	uint16 frameEntryCount;
+	uint8 flags;
+	uint16 roomNumber;
+	uint16 frameTicks;
+	Common::StringList filenames;
+	Common::String lbmFilename;
+	Common::String spritesFilename;
+	Common::String soundName;
+	Common::String fontResource;
+};
+
+enum AAFlags {AA_HAS_FONT = 0x20, AA_HAS_SOUND = 0x8000};
+
 class AnimviewView: public View {
 private:
 	char _resourceName[80];
 	Common::SeekableReadStream *_script;
 	uint32 _previousUpdate;
 	char _currentLine[80];
-	char _currentFile[10];
 	M4Surface _bgSurface;
 	AnimviewCallback _callback;
 	bool _soundDriverLoaded;
@@ -100,7 +119,7 @@
 	int _transition;
 
 	void reset();
-	void processLines();
+	void readNextCommand();
 	void processCommand();
 public:
 	AnimviewView(M4Engine *vm);


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