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

[thebluegr at users.sourceforge.net]

Revision: 49350
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49350&view=rev
Author:   thebluegr
Date:     2010-05-31 12:27:13 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Hopefully fixed compilation

Modified Paths:
--------------
    scummvm/trunk/engines/m4/animation.cpp
    scummvm/trunk/engines/m4/animation.h

Modified: scummvm/trunk/engines/m4/animation.cpp
===================================================================
--- scummvm/trunk/engines/m4/animation.cpp	2010-05-31 12:13:50 UTC (rev 49349)
+++ scummvm/trunk/engines/m4/animation.cpp	2010-05-31 12:27:13 UTC (rev 49350)
@@ -106,7 +106,7 @@
 		// Chunk 2
 		// Following is a list of any messages for the animation
 
-		Common::SeekableReadStream *animStream = anim.getItemStream(streamIndex++);
+		animStream = anim.getItemStream(streamIndex++);
 
 		for (int i = 0; i < messagesCount; ++i) {
 			AnimMessage rec;

Modified: scummvm/trunk/engines/m4/animation.h
===================================================================
--- scummvm/trunk/engines/m4/animation.h	2010-05-31 12:13:50 UTC (rev 49349)
+++ scummvm/trunk/engines/m4/animation.h	2010-05-31 12:27:13 UTC (rev 49350)
@@ -103,10 +103,10 @@
 	uint16 _actionNouns[3];
 
 	void load1(int frameNumber);
-	bool MadsAnimation::proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
+	bool proc1(SpriteAsset &spriteSet, const Common::Point &pt, int frameNumber);
 public:
 	MadsAnimation(MadsM4Engine *vm, MadsView *view);
-    ~MadsAnimation();
+    virtual ~MadsAnimation();
 
     virtual void load(const Common::String &filename);
     virtual void start();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.