[Scummvm-git-logs] scummvm master -> c8cdaef918ec3573d860c04b9a1786538be6c776

[sev-]

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:
c8cdaef918 FULLPIPE: fix #10321 "Hardlock when stepping onto stool"


Commit: c8cdaef918ec3573d860c04b9a1786538be6c776
    https://github.com/scummvm/scummvm/commit/c8cdaef918ec3573d860c04b9a1786538be6c776
Author: dm33tri (dm33tri at gmail.com)
Date: 2018-03-26T21:00:16+02:00

Commit Message:
FULLPIPE: fix #10321 "Hardlock when stepping onto stool"

Scene 22 now doesn't freeze when pulling lever with stool under it

Changed paths:
    engines/fullpipe/scenes/scene22.cpp


diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp
index 5b9b091..f714605 100644
--- a/engines/fullpipe/scenes/scene22.cpp
+++ b/engines/fullpipe/scenes/scene22.cpp
@@ -218,7 +218,7 @@ void sceneHandler22_stoolLogic(ExCommand *cmd) {
 			ani = g_fp->_currentScene->getStaticANIObject1ById(ANI_TABURETTE, -1);
 			if (ani && (ani->_flags & 4)) {
 				int x = g_fp->_aniMan->_ox;
-				int y = g_fp->_aniMan->_ox;
+				int y = g_fp->_aniMan->_oy;
 
 				if (sqrt((double)((841 - x) * (841 - x) + (449 - y) * (449 - y)))
 					< sqrt((double)((1075 - x) * (1075 - x) + (449 - y) * (449 - y)))) {