[Scummvm-git-logs] scummvm master -> 3f99c2c9dd8f92c8f8925f5824c6f69fe7c2305f

[digitall]

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:
3f99c2c9dd PINK: Fix For Assertion When Looking Under Bed in Six House.


Commit: 3f99c2c9dd8f92c8f8925f5824c6f69fe7c2305f
    https://github.com/scummvm/scummvm/commit/3f99c2c9dd8f92c8f8925f5824c6f69fe7c2305f
Author: D G Turner (digitall at scummvm.org)
Date: 2018-11-11T01:58:50Z

Commit Message:
PINK: Fix For Assertion When Looking Under Bed in Six House.

The action which triggers the assertion is CheckUnderBedDB.

This changes ActionPlay::OnStart method to be similar to superclass
implementation with regard to _startFrame to avoid this.

However, the animation still glitches repeating several times, but this
is a script bug in the original and should be addressed in a workaround
in a future commit.

This should fix the main issue in Trac bug #10800.

Changed paths:
    engines/pink/objects/actions/action_play.cpp


diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp
index fb4f05f..9551f13 100644
--- a/engines/pink/objects/actions/action_play.cpp
+++ b/engines/pink/objects/actions/action_play.cpp
@@ -64,7 +64,10 @@ void ActionPlay::onStart() {
 	int frameCount = _decoder.getFrameCount();
 	if (_stopFrame == -1 || _stopFrame >= frameCount)
 		_stopFrame = frameCount - 1;
-	assert(_startFrame < _decoder.getFrameCount());
+
+	if (_startFrame >= _decoder.getFrameCount())
+		_startFrame = 0;
+
 	ActionCEL::setFrame(_startFrame);
 	// doesn't need to decode startFrame here. Update method will decode
 }