[Scummvm-git-logs] scummvm master -> 63f168cd1c020fe4801a1d4f4ced8864918cc1b1

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9278380116 DIRECTOR: Improved debug output
63f168cd1c DIRECTOR: Fix frame script execution


Commit: 927838011648f72a860974281b44afc6e72e972a
    https://github.com/scummvm/scummvm/commit/927838011648f72a860974281b44afc6e72e972a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-27T18:28:18+01:00

Commit Message:
DIRECTOR: Improved debug output

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 705dac8..bb4ac93 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -240,7 +240,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
 
 	while (size != 0) {
 		uint16 frameSize = stream.readUint16();
-		debugC(kDebugLoading, 8, "++++ score frame %d (frameSize %d) size %d", _frames.size(), frameSize, size);
+		debugC(kDebugLoading, 8, "++++ score frame %d (frameSize %d) size %d", _frames.size() + 1, frameSize, size);
 		size -= frameSize;
 		frameSize -= 2;
 
@@ -266,7 +266,7 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
 		//Common::hexdump(channelData, ARRAYSIZE(channelData));
 		frame->readChannels(str);
 
-		debugC(3, kDebugLoading, "Frame %d actionId: %d", _frames.size(), frame->_actionId);
+		debugC(3, kDebugLoading, "Frame %d actionId: %d", _frames.size() + 1, frame->_actionId);
 
 		delete str;
 


Commit: 63f168cd1c020fe4801a1d4f4ced8864918cc1b1
    https://github.com/scummvm/scummvm/commit/63f168cd1c020fe4801a1d4f4ced8864918cc1b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-27T18:28:53+01:00

Commit Message:
DIRECTOR: Fix frame script execution

No idea why the initial frame was removed, but that caused everything
to be shifted by 1, and thus, incorrect scripts were launched

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index bb4ac93..c26a099 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -272,9 +272,6 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
 
 		_frames.push_back(frame);
 	}
-
-	// Remove initial frame
-	_frames.remove_at(0);
 }
 
 void Score::loadConfig(Common::SeekableSubReadStreamEndian &stream) {