[Scummvm-git-logs] scummvm-tools master -> 9a51fc3fa4454d6992cfbfadab8d83d6d9aa5d83

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
582af1640f TOOLS: Fix V0: setBitVar can take 3 variables
9a51fc3fa4 Merge pull request #13 from segrax/patch-1


Commit: 582af1640fc9c418bbc21ea88f4d41d08531e60a
    https://github.com/scummvm/scummvm-tools/commit/582af1640fc9c418bbc21ea88f4d41d08531e60a
Author: Robert Crossfield (robcrossfield at gmail.com)
Date: 2017-02-19T19:12:32+11:00

Commit Message:
TOOLS: Fix V0: setBitVar can take 3 variables

Currently certain calls to setBitVar are outputting (script-42 V0 / script-6 v0 demo)
[079A] (9D) setBitVar(4,VAR_RESULT,0);

when it should be
[079A] (9D) setBitVar(VAR_ROOM,1,0);

Changed paths:
    engines/scumm/descumm.cpp


diff --git a/engines/scumm/descumm.cpp b/engines/scumm/descumm.cpp
index a7fafeb..e59a37e 100644
--- a/engines/scumm/descumm.cpp
+++ b/engines/scumm/descumm.cpp
@@ -2503,7 +2503,7 @@ void next_line_V0(char *buf) {
 	case 0xBD:
 	case 0xDD:
 	case 0xFD:
-		do_tok(buf, "setBitVar", A1B | ((opcode & 0x80) ? A2V : A2B) | ((opcode & 0x40) ? A3V : A3B));
+		do_tok(buf, "setBitVar", ((opcode & 0x80) ? A1V : A1B) | ((opcode & 0x40) ? A2V : A2B) | ((opcode & 0x20) ? A3V : A3B));
 		break;
 
 	case 0x1B:


Commit: 9a51fc3fa4454d6992cfbfadab8d83d6d9aa5d83
    https://github.com/scummvm/scummvm-tools/commit/9a51fc3fa4454d6992cfbfadab8d83d6d9aa5d83
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-02-13T08:03:25+01:00

Commit Message:
Merge pull request #13 from segrax/patch-1

TOOLS: Fix V0: setBitVar can take 3 variables

Changed paths:
    engines/scumm/descumm.cpp