[Scummvm-cvs-logs] scummvm master -> 4ff543b22a19ffccfec2d176e2cb0b92b13de2e1

sev- sev at scummvm.org
Sun Jun 8 21:08:13 CEST 2014


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:
4ff543b22a FULLPIPE: Fix lockup on game start


Commit: 4ff543b22a19ffccfec2d176e2cb0b92b13de2e1
    https://github.com/scummvm/scummvm/commit/4ff543b22a19ffccfec2d176e2cb0b92b13de2e1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-08T22:07:39+03:00

Commit Message:
FULLPIPE: Fix lockup on game start

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index ec85141..292ef08 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1766,8 +1766,8 @@ Common::Point *Movement::calcSomeXY(Common::Point &p, int idx, int dynidx) {
 
 	setOXY(x, y);
 
-	while (_currDynamicPhaseIndex != dynidx)
-		gotoNextFrame(0, 0);
+	while (_currDynamicPhaseIndex != dynidx && gotoNextFrame(0, 0))
+		;
 
 	p.x = _ox;
 	p.y = _oy;






More information about the Scummvm-git-logs mailing list