diff options
author | Paul Gilbert | 2016-04-09 14:24:52 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-04-09 14:24:52 -0400 |
commit | 3d166fb8a91a4d56bc1abac6f1e3899a0379cd31 (patch) | |
tree | d17c4fc95bb6c828741ad40076b8d9e62ca9f90d /engines/titanic/support | |
parent | 09a3ca07287b77d4abd5713b6c34548ebd8b84a8 (diff) | |
download | scummvm-rg350-3d166fb8a91a4d56bc1abac6f1e3899a0379cd31.tar.gz scummvm-rg350-3d166fb8a91a4d56bc1abac6f1e3899a0379cd31.tar.bz2 scummvm-rg350-3d166fb8a91a4d56bc1abac6f1e3899a0379cd31.zip |
TITANIC: More implementation code for movie playback
Diffstat (limited to 'engines/titanic/support')
-rw-r--r-- | engines/titanic/support/movie.cpp | 3 | ||||
-rw-r--r-- | engines/titanic/support/movie.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index d614ea7d9b..f2c5643f78 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -45,7 +45,8 @@ bool CMovie::get10() { /*------------------------------------------------------------------------*/ -OSMovie::OSMovie(const CResourceKey &name, CVideoSurface *surface) : _videoSurface(surface) { +OSMovie::OSMovie(const CResourceKey &name, CVideoSurface *surface) : + _videoSurface(surface), _gameObject(nullptr) { _video = new AVIDecoder(); if (!_video->loadFile(name.getString())) error("Could not open video - %s", name.getString().c_str()); diff --git a/engines/titanic/support/movie.h b/engines/titanic/support/movie.h index dfb0ca108a..0772635908 100644 --- a/engines/titanic/support/movie.h +++ b/engines/titanic/support/movie.h @@ -35,6 +35,7 @@ enum MovieState { class CVideoSurface; class CMovie; +class CGameObject; class CMovieList : public List<CMovie> { public: @@ -81,6 +82,8 @@ private: */ void decodeFrame(); public: + CGameObject *_gameObject; +public: OSMovie(const CResourceKey &name, CVideoSurface *surface); virtual ~OSMovie(); |