[Scummvm-cvs-logs] scummvm master -> 7ed6e373352ccf8af66fa450947da9f589260203
dreammaster
dreammaster at scummvm.org
Sat Aug 22 00:53:31 CEST 2015
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:
7ed6e37335 SHERLOCK: SS: Simplify pushSequenceEntry
Commit: 7ed6e373352ccf8af66fa450947da9f589260203
https://github.com/scummvm/scummvm/commit/7ed6e373352ccf8af66fa450947da9f589260203
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-21T18:53:01-04:00
Commit Message:
SHERLOCK: SS: Simplify pushSequenceEntry
Changed paths:
engines/sherlock/scalpel/scalpel_talk.cpp
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 4debe7f..6f98a17 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -885,12 +885,11 @@ void ScalpelTalk::pushSequenceEntry(Object *obj) {
seqEntry._objNum = scene._bgShapes.indexOf(*obj);
if (seqEntry._objNum != -1) {
- Object &obj = scene._bgShapes[seqEntry._objNum];
for (uint idx = 0; idx < MAX_TALK_SEQUENCES; ++idx)
- seqEntry._sequences.push_back(obj._sequences[idx]);
+ seqEntry._sequences.push_back(obj->_sequences[idx]);
- seqEntry._frameNumber = obj._frameNumber;
- seqEntry._seqTo = obj._seqTo;
+ seqEntry._frameNumber = obj->_frameNumber;
+ seqEntry._seqTo = obj->_seqTo;
}
_sequenceStack.push(seqEntry);
More information about the Scummvm-git-logs
mailing list