diff options
| author | Paul Gilbert | 2016-06-19 20:58:37 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:23:44 -0400 |
| commit | f0889c17a46019b8b294a74d054d0c60e445190b (patch) | |
| tree | d9ddfcb512eefb3bcca3307228464d27ce0c4027 /engines/titanic/support | |
| parent | 2267c5eb4c5addecbf0012495f84ece6d6df835d (diff) | |
| download | scummvm-rg350-f0889c17a46019b8b294a74d054d0c60e445190b.tar.gz scummvm-rg350-f0889c17a46019b8b294a74d054d0c60e445190b.tar.bz2 scummvm-rg350-f0889c17a46019b8b294a74d054d0c60e445190b.zip | |
TITANIC: Implementing lots of cGameObject methods
Diffstat (limited to 'engines/titanic/support')
| -rw-r--r-- | engines/titanic/support/movie.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/support/movie.h | 2 | ||||
| -rw-r--r-- | engines/titanic/support/video_surface.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/support/video_surface.h | 4 |
4 files changed, 16 insertions, 2 deletions
diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index 1c94cab250..26620de3a6 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -26,7 +26,8 @@ namespace Titanic { -CMovie::CMovie() : ListItem(), _state(MOVIE_STOPPED), _field10(0) { +CMovie::CMovie() : ListItem(), _state(MOVIE_STOPPED), _field10(0), + _field14(0) { } CMovie::~CMovie() { @@ -50,7 +51,10 @@ bool CMovie::get10() { OSMovie::OSMovie(const CResourceKey &name, CVideoSurface *surface) : _videoSurface(surface), _gameObject(nullptr), _endFrame(-1) { - _video = new Video::AVIDecoder(); + Video::AVIDecoder *decoder = new Video::AVIDecoder(); + _video = decoder; + _field14 = 1; + 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 20de84afa5..01f107ec5b 100644 --- a/engines/titanic/support/movie.h +++ b/engines/titanic/support/movie.h @@ -46,6 +46,8 @@ protected: MovieState _state; int _field10; public: + int _field14; +public: CMovie(); virtual ~CMovie(); diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp index 813138da4a..3b026c546c 100644 --- a/engines/titanic/support/video_surface.cpp +++ b/engines/titanic/support/video_surface.cpp @@ -418,6 +418,10 @@ void OSVideoSurface::setMovieFrame(uint frameNumber) { _movie->setFrame(frameNumber); } +void OSVideoSurface::proc38(int v1, int v2) { + warning("OSVideoSurface::proc38"); +} + bool OSVideoSurface::loadIfReady() { _videoSurfaceNum = _videoSurfaceCounter; diff --git a/engines/titanic/support/video_surface.h b/engines/titanic/support/video_surface.h index aee28be730..8d0dd2ffac 100644 --- a/engines/titanic/support/video_surface.h +++ b/engines/titanic/support/video_surface.h @@ -178,6 +178,8 @@ public: */ virtual void setMovieFrame(uint frameNumber) = 0; + virtual void proc38(int v1, int v2) = 0; + /** * Loads the surface's resource if there's one pending */ @@ -343,6 +345,8 @@ public: */ virtual void setMovieFrame(uint frameNumber); + virtual void proc38(int v1, int v2); + /** * Loads the surface's resource if there's one pending */ |