[Scummvm-cvs-logs] scummvm master -> 74282cd4158dbdea6c8b0c6cd965e081103af618

somaen einarjohants at gmail.com
Wed Jan 15 12:11:52 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
74282cd415 WINTERMUTE: Stop any playing FMV when loading a savegame.


Commit: 74282cd4158dbdea6c8b0c6cd965e081103af618
    https://github.com/scummvm/scummvm/commit/74282cd4158dbdea6c8b0c6cd965e081103af618
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-01-15T03:11:07-08:00

Commit Message:
WINTERMUTE: Stop any playing FMV when loading a savegame.

Changed paths:
    engines/wintermute/base/base_game.h
    engines/wintermute/base/saveload.cpp



diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 742d6f5..29d312f 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 8d37909..402041c 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;






More information about the Scummvm-git-logs mailing list