aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/support/video_surface.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-07-03 17:43:37 -0400
committerPaul Gilbert2016-07-15 19:27:13 -0400
commitfb06cb4dde4d612289ea1b5830f8cd1c9e1bedfc (patch)
tree0ce71b408ad206b4fb2bcaa75b2faac73d6756a0 /engines/titanic/support/video_surface.cpp
parent3f12927b77735c17eedfbe14f36607ddc6580c83 (diff)
downloadscummvm-rg350-fb06cb4dde4d612289ea1b5830f8cd1c9e1bedfc.tar.gz
scummvm-rg350-fb06cb4dde4d612289ea1b5830f8cd1c9e1bedfc.tar.bz2
scummvm-rg350-fb06cb4dde4d612289ea1b5830f8cd1c9e1bedfc.zip
TITANIC: Added CMovieManager class
Diffstat (limited to 'engines/titanic/support/video_surface.cpp')
-rw-r--r--engines/titanic/support/video_surface.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/titanic/support/video_surface.cpp b/engines/titanic/support/video_surface.cpp
index 85a1aa1c58..0335e7d9b1 100644
--- a/engines/titanic/support/video_surface.cpp
+++ b/engines/titanic/support/video_surface.cpp
@@ -23,6 +23,7 @@
#include "titanic/support/video_surface.h"
#include "titanic/support/image_decoders.h"
#include "titanic/support/screen_manager.h"
+#include "titanic/titanic.h"
namespace Titanic {
@@ -234,6 +235,11 @@ void OSVideoSurface::loadJPEG(const CResourceKey &key) {
_resourceKey = key;
}
+void OSVideoSurface::loadTarga(const CString &name) {
+ CResourceKey key(name);
+ loadTarga(key);
+}
+
void OSVideoSurface::loadMovie(const CResourceKey &key, bool destroyFlag) {
// Delete any prior movie
if (_movie) {
@@ -242,7 +248,7 @@ void OSVideoSurface::loadMovie(const CResourceKey &key, bool destroyFlag) {
}
// Create the new movie and load the first frame to the video surface
- _movie = new OSMovie(key, this);
+ _movie = g_vm->_movieManager.createMovie(key, this);
_movie->setFrame(0);
// If flagged to destroy, then immediately destroy movie instance