aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-05-31 12:27:13 +0000
committerFilippos Karapetis2010-05-31 12:27:13 +0000
commitff40247376606412556e4cc39b4da3361842dd3c (patch)
tree5ddc39f88438847937cc2137d00d4fd92f56466d
parentcc025ace18b2bd47e81d4ec1ac46aa9abb566c16 (diff)
downloadscummvm-rg350-ff40247376606412556e4cc39b4da3361842dd3c.tar.gz
scummvm-rg350-ff40247376606412556e4cc39b4da3361842dd3c.tar.bz2
scummvm-rg350-ff40247376606412556e4cc39b4da3361842dd3c.zip
Hopefully fixed compilation
svn-id: r49350
-rw-r--r--engines/m4/animation.cpp2
-rw-r--r--engines/m4/animation.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp
index 4b6be82fad..9c31cd35d7 100644
--- a/engines/m4/animation.cpp
+++ b/engines/m4/animation.cpp
@@ -106,7 +106,7 @@ void MadsAnimation::load(const Common::String &filename) {
// 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;
diff --git a/engines/m4/animation.h b/engines/m4/animation.h
index b7e88f0871..41ad40ef9a 100644
--- a/engines/m4/animation.h
+++ b/engines/m4/animation.h
@@ -103,10 +103,10 @@ private:
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();