[Scummvm-git-logs] scummvm master -> 23fd97c99a650cf2e99df72a74326520b9347fc7

bonki bonki at users.noreply.github.com
Sun Mar 18 23:39:30 CET 2018


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:
23fd97c99a TUCKER: Actually implement mof opcode


Commit: 23fd97c99a650cf2e99df72a74326520b9347fc7
    https://github.com/scummvm/scummvm/commit/23fd97c99a650cf2e99df72a74326520b9347fc7
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-03-18T23:38:52+01:00

Commit Message:
TUCKER: Actually implement mof opcode

When the 'mof' opcode was added in commit 1946dead77 it was implemented
as a NOOP, but what it actually should do is disable the mouse (set
_cursorState to kCursorStateDisabledHidden).
This is used in at least the Spanish and Polish versions of the game to
work around an earlier script bug which allowed the player to use the
mouse while freeing the professor in part two.

This commit fixes the 'mof' instruction so that the original script works
as intended in those versions that ship with the fix.

TODO: Add a workaround for those game versions which don't do the 'mof'
themselves.

Changed paths:
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 9e21a10..e1d05ec 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -3391,7 +3391,7 @@ int TuckerEngine::executeTableInstruction() {
 		_nextLocationNum = readTableInstructionParam(2);
 		return 1;
 	case kCode_mof:
-		// TODO: Unknown opcode in Spanish version. Identify if this has any function.
+		setCursorState(kCursorStateDisabledHidden);
 		return 0;
 	case kCode_opt:
 		_conversationOptionsCount = readTableInstructionParam(2);





More information about the Scummvm-git-logs mailing list