[Scummvm-cvs-logs] scummvm master -> 1879151c227ecb9074117d2bd562db45ee7af507
dreammaster
dreammaster at scummvm.org
Sat Feb 1 18:59:31 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:
1879151c22 TSAGE: Fix for voice playback never calling it's end action when finished
Commit: 1879151c227ecb9074117d2bd562db45ee7af507
https://github.com/scummvm/scummvm/commit/1879151c227ecb9074117d2bd562db45ee7af507
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-02-01T09:58:51-08:00
Commit Message:
TSAGE: Fix for voice playback never calling it's end action when finished
Changed paths:
engines/tsage/ringworld2/ringworld2_logic.cpp
engines/tsage/ringworld2/ringworld2_logic.h
diff --git a/engines/tsage/ringworld2/ringworld2_logic.cpp b/engines/tsage/ringworld2/ringworld2_logic.cpp
index 39e3980..b97f63b 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.cpp
+++ b/engines/tsage/ringworld2/ringworld2_logic.cpp
@@ -625,6 +625,11 @@ void SceneHandlerExt::process(Event &event) {
SceneHandler::process(event);
}
+void SceneHandlerExt::dispatch() {
+ R2_GLOBALS._playStream.dispatch();
+ SceneHandler::dispatch();
+}
+
void SceneHandlerExt::postLoad(int priorSceneBeforeLoad, int currentSceneBeforeLoad) {
// Set up the shading maps used for showing the player in shadows
setupPaletteMaps();
diff --git a/engines/tsage/ringworld2/ringworld2_logic.h b/engines/tsage/ringworld2/ringworld2_logic.h
index c9695c9..101b0f5 100644
--- a/engines/tsage/ringworld2/ringworld2_logic.h
+++ b/engines/tsage/ringworld2/ringworld2_logic.h
@@ -114,6 +114,7 @@ public:
virtual void postInit(SceneObjectList *OwnerList = NULL);
virtual void process(Event &event);
virtual void postLoad(int priorSceneBeforeLoad, int currentSceneBeforeLoad);
+ virtual void dispatch();
void setupPaletteMaps();
};
More information about the Scummvm-git-logs
mailing list