diff options
author | Paul Gilbert | 2016-06-29 22:05:06 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:26:02 -0400 |
commit | 8ea5d533294193a4d220316152cec59580bbf10c (patch) | |
tree | 82e567f58e70c7fce694bc18d8ce04969545df5b /engines/titanic/support/video_surface.cpp | |
parent | 5ccc0a66da38d23520234e7060efaf966d3345b9 (diff) | |
download | scummvm-rg350-8ea5d533294193a4d220316152cec59580bbf10c.tar.gz scummvm-rg350-8ea5d533294193a4d220316152cec59580bbf10c.tar.bz2 scummvm-rg350-8ea5d533294193a4d220316152cec59580bbf10c.zip |
TITANIC: Added CGameObject saving, and movie range info methods
Diffstat (limited to 'engines/titanic/support/video_surface.cpp')
-rw-r--r-- | engines/titanic/support/video_surface.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp index c1af869e1e..9293b03f02 100644 --- a/engines/titanic/support/video_surface.cpp +++ b/engines/titanic/support/video_surface.cpp @@ -402,9 +402,9 @@ void OSVideoSurface::playMovie(uint startFrame, uint endFrame, int v3, bool v4) } } -void OSVideoSurface::proc35(const CString &name, int flags, CGameObject *owner) { +void OSVideoSurface::proc35(int v1, int v2, int frameNumber, int flags, CGameObject *owner) { if (loadIfReady() && _movie) { - _movie->proc12(name, flags, owner); + _movie->proc12(v1, v2, frameNumber, flags, owner); } } @@ -426,6 +426,10 @@ void OSVideoSurface::proc39(int v1, int v2) { warning("OSVideoSurface::proc39"); } +const Common::List<CMovieRangeInfo *> OSVideoSurface::getMovieRangeInfo() const { + return _movie ? _movie->getMovieRangeInfo() : Common::List<CMovieRangeInfo *>(); +} + bool OSVideoSurface::loadIfReady() { _videoSurfaceNum = _videoSurfaceCounter; |