diff options
| author | Einar Johan Trøan Sømåen | 2014-01-15 12:11:07 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2014-01-15 12:11:07 +0100 |
| commit | 74282cd4158dbdea6c8b0c6cd965e081103af618 (patch) | |
| tree | 8fae94e2fdd8e879ecba04c77cc61ad4176ca372 | |
| parent | ab98e22c3b208ef4f6321e0c675fcb02667372a5 (diff) | |
| download | scummvm-rg350-74282cd4158dbdea6c8b0c6cd965e081103af618.tar.gz scummvm-rg350-74282cd4158dbdea6c8b0c6cd965e081103af618.tar.bz2 scummvm-rg350-74282cd4158dbdea6c8b0c6cd965e081103af618.zip | |
WINTERMUTE: Stop any playing FMV when loading a savegame.
| -rw-r--r-- | engines/wintermute/base/base_game.h | 3 | ||||
| -rw-r--r-- | engines/wintermute/base/saveload.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 742d6f548d..29d312fe97 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -251,6 +251,8 @@ public: void addMem(int32 bytes); bool _touchInterface; bool _constrainedMemory; + + bool stopVideo(); protected: BaseFont *_systemFont; BaseFont *_videoFont; @@ -319,7 +321,6 @@ private: BaseGameMusic *_musicSystem; bool isVideoPlaying(); - bool stopVideo(); BaseArray<BaseQuickMsg *> _quickMessages; BaseArray<UIWindow *> _windows; diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp index 8d37909bb4..402041cda4 100644 --- a/engines/wintermute/base/saveload.cpp +++ b/engines/wintermute/base/saveload.cpp @@ -48,6 +48,7 @@ bool SaveLoad::loadGame(const Common::String &filename, BaseGame *gameRef) { bool ret; + gameRef->stopVideo(); gameRef->_renderer->initSaveLoad(false); gameRef->_loadInProgress = true; |