[Scummvm-cvs-logs] scummvm master -> 6c3af3c2e7b8d2852669c141944964c82a11ce1b

bluegr bluegr at gmail.com
Tue Dec 30 02:52:34 CET 2014


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:
7182b4f704 ZVISION: Initialize the starting frame to -1 in RLF animations
6c3af3c2e7 ZVISION: White space


Commit: 7182b4f704a312427dc701ccc8452331ca66faae
    https://github.com/scummvm/scummvm/commit/7182b4f704a312427dc701ccc8452331ca66faae
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-30T03:51:15+02:00

Commit Message:
ZVISION: Initialize the starting frame to -1 in RLF animations

Changed paths:
    engines/zvision/video/rlf_decoder.cpp



diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp
index 1478822..6e2000f 100644
--- a/engines/zvision/video/rlf_decoder.cpp
+++ b/engines/zvision/video/rlf_decoder.cpp
@@ -56,7 +56,7 @@ RLFDecoder::RLFVideoTrack::RLFVideoTrack(Common::SeekableReadStream *stream)
 	  _height(0),
 	  _frameTime(0),
 	  _frames(0),
-	  _curFrame(0),
+	  _curFrame(-1),
 	  _frameBufferByteSize(0) {
 
 	if (!readHeader()) {


Commit: 6c3af3c2e7b8d2852669c141944964c82a11ce1b
    https://github.com/scummvm/scummvm/commit/6c3af3c2e7b8d2852669c141944964c82a11ce1b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-30T03:51:31+02:00

Commit Message:
ZVISION: White space

Changed paths:
    engines/zvision/scripting/sidefx/animation_node.cpp



diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index a0870bf..07eda69 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -186,7 +186,7 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
 	nod.loop = loops;
 	nod.pos = Common::Rect(x, y, x2 + 1, y2 + 1);
 	nod.start = startFrame;
-	_animation->setEndFrame(CLIP<int>(endFrame, 0,_animation->getFrameCount() - 1));
+	_animation->setEndFrame(CLIP<int>(endFrame, 0, _animation->getFrameCount() - 1));
 
 	nod.slot = slot;
 	nod._delay = 0;






More information about the Scummvm-git-logs mailing list