[Scummvm-git-logs] scummvm master -> 3b706314dadde2d6b420e8c88847d7b778c397c4
sev-
sev at scummvm.org
Wed Jan 8 22:42:25 UTC 2020
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:
3b706314da DIRECTOR: Correctly set script type for Lscr bytecode
Commit: 3b706314dadde2d6b420e8c88847d7b778c397c4
https://github.com/scummvm/scummvm/commit/3b706314dadde2d6b420e8c88847d7b778c397c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-08T23:42:11+01:00
Commit Message:
DIRECTOR: Correctly set script type for Lscr bytecode
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 88927c1..67eb27b 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -781,7 +781,7 @@ void Score::loadCastData(Common::SeekableSubReadStreamEndian &stream, uint16 id,
uint scriptId = ((ScriptCast *)(*_loadedCast)[id])->_id - 1;
if (scriptId < _castScriptIds.size()) {
int resourceId = _castScriptIds[scriptId];
- _lingo->addCodeV4(*_movieArchive->getResource(MKTAG('L', 's', 'c', 'r'), resourceId), kCastScript, id);
+ _lingo->addCodeV4(*_movieArchive->getResource(MKTAG('L', 's', 'c', 'r'), resourceId), ((ScriptCast *)_loadedCast->getVal(id))->_scriptType, id);
} else {
warning("Score::loadCastData(): Lingo context missing a resource entry for script %d referenced in cast %d", scriptId, id);
}
More information about the Scummvm-git-logs
mailing list