aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/support/movie.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-04 22:18:18 -0400
committerPaul Gilbert2016-04-04 22:18:18 -0400
commit303f577c4f9b36cd78f5104a2971a27263fb051c (patch)
treeadc14b3b519497fe1e5c9185fd821fc9bd0007da /engines/titanic/support/movie.h
parent572301a33efc8c574d7ab2fc9b243050b2db1492 (diff)
downloadscummvm-rg350-303f577c4f9b36cd78f5104a2971a27263fb051c.tar.gz
scummvm-rg350-303f577c4f9b36cd78f5104a2971a27263fb051c.tar.bz2
scummvm-rg350-303f577c4f9b36cd78f5104a2971a27263fb051c.zip
TITANIC: Hacked copy of AVIDecoder to handle ycursors.avi
Mouse cursor is now somewhat correctly showing
Diffstat (limited to 'engines/titanic/support/movie.h')
-rw-r--r--engines/titanic/support/movie.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/titanic/support/movie.h b/engines/titanic/support/movie.h
index 3529409fa5..e84e283597 100644
--- a/engines/titanic/support/movie.h
+++ b/engines/titanic/support/movie.h
@@ -23,7 +23,7 @@
#ifndef TITANIC_MOVIE_H
#define TITANIC_MOVIE_H
-#include "video/avi_decoder.h"
+#include "video/video_decoder.h"
#include "titanic/core/list.h"
#include "titanic/core/resource_key.h"
@@ -37,6 +37,7 @@ protected:
int _field10;
public:
CMovie();
+ virtual ~CMovie() {}
virtual void proc8(int v1, CVideoSurface *surface) = 0;
virtual void proc9() = 0;
@@ -60,10 +61,11 @@ public:
class OSMovie : public CMovie {
private:
- Video::AVIDecoder _aviDecoder;
+ Video::VideoDecoder *_video;
CVideoSurface *_videoSurface;
public:
OSMovie(const CResourceKey &name, CVideoSurface *surface);
+ virtual ~OSMovie();
virtual void proc8(int v1, CVideoSurface *surface);
virtual void proc9();