[Scummvm-git-logs] scummvm master -> 46316fdb63c5ce945fbad3434d9078628014097a

sev- sev at scummvm.org
Tue Aug 30 23:41:34 CEST 2016


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:
46316fdb63 FULLPIPE: Fix length calculation in AniHandler::getNumCycles


Commit: 46316fdb63c5ce945fbad3434d9078628014097a
    https://github.com/scummvm/scummvm/commit/46316fdb63c5ce945fbad3434d9078628014097a
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-30T23:41:14+02:00

Commit Message:
FULLPIPE: Fix length calculation in AniHandler::getNumCycles

Changed paths:
    engines/fullpipe/anihandler.cpp



diff --git a/engines/fullpipe/anihandler.cpp b/engines/fullpipe/anihandler.cpp
index 71c894b..126abbf 100644
--- a/engines/fullpipe/anihandler.cpp
+++ b/engines/fullpipe/anihandler.cpp
@@ -639,7 +639,6 @@ Common::Point *AniHandler::getNumCycles(Common::Point *pRes, Movement *mov, int
 	int p1y = point.y;
 
 	int newmult = 0;
-	int oldlen = *len;
 
 	if (abs(p1y) > abs(p1x)) {
 		if (mov->calcSomeXY(point, 0, -1)->y)
@@ -685,13 +684,13 @@ Common::Point *AniHandler::getNumCycles(Common::Point *pRes, Movement *mov, int
 	int p2x = 0;
 	int p2y = 0;
 
-	if (!oldlen)
-		oldlen = -1;
+	if (!*len)
+		*len = -1;
 
-	if (oldlen > 0) {
+	if (*len > 0) {
 		++*mult;
 
-		mov->calcSomeXY(point, 0, oldlen);
+		mov->calcSomeXY(point, 0, *len);
 		p2x = point.x;
 		p2y = point.y;
 





More information about the Scummvm-git-logs mailing list