[Scummvm-git-logs] scummvm master -> 3873730ecf9953150262927318f6e829a6bbd48e
sev-
sev at scummvm.org
Tue Feb 21 09:19:40 CET 2017
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:
3873730ecf DIRECTOR: Properly load Movie Script for D2 and D3
Commit: 3873730ecf9953150262927318f6e829a6bbd48e
https://github.com/scummvm/scummvm/commit/3873730ecf9953150262927318f6e829a6bbd48e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-21T09:12:46+01:00
Commit Message:
DIRECTOR: Properly load Movie Script for D2 and D3
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index d7ca7bf..975c6ef 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -160,10 +160,13 @@ void Score::loadArchive() {
setSpriteCasts();
- //Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T'));
- //if (stxt.size() > 0) {
- // loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin()));
- //}
+ // Try to load movie script, it sits in resource A11
+ if (_vm->getVersion() <= 3) {
+ Common::Array<uint16> stxt = _movieArchive->getResourceIDList(MKTAG('S','T','X','T'));
+ if (stxt.size() > 0) {
+ loadScriptText(*_movieArchive->getResource(MKTAG('S','T','X','T'), *stxt.begin()));
+ }
+ }
}
Score::~Score() {
@@ -869,7 +872,6 @@ void Score::startLoop() {
_stopPlay = false;
_nextFrameTime = 0;
- _lingo->processEvent(kEventStartMovie, kMovieScript, 0);
_frames[_currentFrame]->prepareFrame(this);
while (!_stopPlay && _currentFrame < _frames.size()) {
More information about the Scummvm-git-logs
mailing list