[Scummvm-cvs-logs] scummvm master -> 3344cf424a90d22ab44c8b64b7ad598a53147e26
dreammaster
dreammaster at scummvm.org
Wed Jan 4 11:17:07 CET 2012
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:
3344cf424a TSAGE: Added needed speaker method call for R2R in StripManager::signal
Commit: 3344cf424a90d22ab44c8b64b7ad598a53147e26
https://github.com/scummvm/scummvm/commit/3344cf424a90d22ab44c8b64b7ad598a53147e26
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2012-01-04T02:16:32-08:00
Commit Message:
TSAGE: Added needed speaker method call for R2R in StripManager::signal
Changed paths:
engines/tsage/converse.cpp
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index c3b48a7..06fbffb 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -25,6 +25,7 @@
#include "tsage/tsage.h"
#include "tsage/globals.h"
#include "tsage/staticres.h"
+#include "ringworld2/ringworld2_speakers.h"
namespace TsAGE {
@@ -836,6 +837,9 @@ void StripManager::signal() {
}
}
+ if ((g_vm->getGameID() == GType_Ringworld2) && (_obj44List.size() > 0))
+ static_cast<Ringworld2::VisualSpeaker *>(_activeSpeaker)->proc15();
+
_textShown = true;
_activeSpeaker->setText(choiceList[strIndex]);
}
More information about the Scummvm-git-logs
mailing list