[Scummvm-cvs-logs] scummvm master -> b0c76b3a17a08abed2d35d301cbd69f9bc8efa52

dreammaster dreammaster at scummvm.org
Sun Apr 5 13:51:31 CEST 2015


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:
b0c76b3a17 TONY: Fix disabled ui after capturing guard on Ferris Wheel


Commit: b0c76b3a17a08abed2d35d301cbd69f9bc8efa52
    https://github.com/scummvm/scummvm/commit/b0c76b3a17a08abed2d35d301cbd69f9bc8efa52
Author: unknown (dreammaster at scummvm.org)
Date: 2015-04-05T07:50:13-05:00

Commit Message:
TONY: Fix disabled ui after capturing guard on Ferris Wheel

Changed paths:
    engines/tony/mpal/mpal.cpp



diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index c813b35..89cc281 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -709,6 +709,10 @@ void ActionThread(CORO_PARAM, const void *param) {
 		CORO_SLEEP(1);
 	}
 
+	// WORKAROUND: User interface sometimes remaining disabled after capturing guard on Ferris wheel
+	if (_ctx->item->_nObj == 3601 && _ctx->item->_dwRes == 9)
+		g_vm->getEngine()->enableInput();
+
 	globalDestroy(_ctx->item);
 	_ctx->item = NULL;
 






More information about the Scummvm-git-logs mailing list