diff options
| author | Paul Gilbert | 2016-04-10 15:01:39 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:10:50 -0400 |
| commit | 8e5f7a9453deff3436fc937292a0ff825acd7454 (patch) | |
| tree | cad890d8f9961a61b8da73a35e9fc96d9cbf2b37 | |
| parent | 9db15f6967c8f559e34824213707ed76b45d666e (diff) | |
| download | scummvm-rg350-8e5f7a9453deff3436fc937292a0ff825acd7454.tar.gz scummvm-rg350-8e5f7a9453deff3436fc937292a0ff825acd7454.tar.bz2 scummvm-rg350-8e5f7a9453deff3436fc937292a0ff825acd7454.zip | |
TITANIC: Fix stopping movies
| -rw-r--r-- | engines/titanic/main_game_window.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/movie.cpp | 3 | ||||
| -rw-r--r-- | engines/titanic/support/movie.h | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp index 5b8cba341a..a524529492 100644 --- a/engines/titanic/main_game_window.cpp +++ b/engines/titanic/main_game_window.cpp @@ -113,7 +113,7 @@ void CMainGameWindow::setActiveView(CViewItem *viewItem) { void CMainGameWindow::draw() { if (_gameManager) { - if (_gameView->_surface) { + if (!_gameView->_surface) { CViewItem *view = _gameManager->getView(); if (view) setActiveView(view); diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index dd0792caa4..0627da8c4f 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -94,7 +94,8 @@ void OSMovie::proc12() { } void OSMovie::stop() { - warning("TODO: OSMovie::proc13"); + _video->stop(); + _state = MOVIE_STOPPED; } void OSMovie::proc14() { diff --git a/engines/titanic/support/movie.h b/engines/titanic/support/movie.h index 2751f2d814..d88c7b0be9 100644 --- a/engines/titanic/support/movie.h +++ b/engines/titanic/support/movie.h @@ -62,7 +62,12 @@ public: virtual void proc10() = 0; virtual void proc11() = 0; virtual void proc12() = 0; + + /** + * Stops the movie + */ virtual void stop() = 0; + virtual void proc14() = 0; virtual void setFrame(uint frameNumber) = 0; virtual void proc16() = 0; @@ -109,7 +114,12 @@ public: virtual void proc10(); virtual void proc11(); virtual void proc12(); + + /** + * Stops the movie + */ virtual void stop(); + virtual void proc14(); /** |