aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordm33tri2018-03-27 02:00:16 +0700
committerEugene Sandulenko2018-03-26 21:00:16 +0200
commitc8cdaef918ec3573d860c04b9a1786538be6c776 (patch)
tree7862076018f868fde0368f3a54eb7518b762d266
parent32a84f196fe8ee537e8e7d21c44c0c383c66082a (diff)
downloadscummvm-rg350-c8cdaef918ec3573d860c04b9a1786538be6c776.tar.gz
scummvm-rg350-c8cdaef918ec3573d860c04b9a1786538be6c776.tar.bz2
scummvm-rg350-c8cdaef918ec3573d860c04b9a1786538be6c776.zip
FULLPIPE: fix #10321 "Hardlock when stepping onto stool"
Scene 22 now doesn't freeze when pulling lever with stool under it
-rw-r--r--engines/fullpipe/scenes/scene22.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp
index 5b9b091f36..f71460576f 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)))) {