[Scummvm-git-logs] scummvm master -> 5b2c2637fcc025b7919c03cc0b0bfa28d45baa0a

[somaen]

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

Summary:
d79d68f0c5 TINSEL: Map HIDETAG
891001657f TINSEL: Map CALLTAG
5b2c2637fc TINSEL: Map SHOWTAG


Commit: d79d68f0c596dc40274e7b81d7c9a291f23c676f
    https://github.com/scummvm/scummvm/commit/d79d68f0c596dc40274e7b81d7c9a291f23c676f
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-06T13:26:29+01:00

Commit Message:
TINSEL: Map HIDETAG

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 2155c33b75..4e0c431e5e 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4324,6 +4324,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%d)", mapping.name, pp[0]);
 		break;
+	case 83:
+		mapping = NoirMapping{"HIDETAG", HIDETAG, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(%d)", mapping.name, pp[0]);
+		break;
 	case 86:
 		mapping = NoirMapping{"OP86", ZZZZZZ, 2};
 		pp -= mapping.numArgs - 1;
@@ -5024,7 +5029,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return -1;
 
 	case HIDEREFER:
-		// DW2 only
+		// DW2 / Noir
 		HideRefer(pp[0]);
 		return -1;
 


Commit: 891001657f92f2c0a8e126237b3dfb78a9767652
    https://github.com/scummvm/scummvm/commit/891001657f92f2c0a8e126237b3dfb78a9767652
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-06T13:26:29+01:00

Commit Message:
TINSEL: Map CALLTAG

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 4e0c431e5e..aa6f123d91 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4257,6 +4257,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%08X)", mapping.name, pp[0]);
 		break;
+	case 26:
+		mapping = NoirMapping{"CALLTAG", CALLTAG, 2};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(0x%08X, 0x%08X)", mapping.name, pp[0], pp[1]);
+		break;
 	case 28:
 		mapping = NoirMapping{"CDCHANGESCENE", CDCHANGESCENE, 1};
 		pp -= mapping.numArgs - 1;
@@ -4671,7 +4676,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		error("CallScene isn't a real function");
 
 	case CALLTAG:
-		// DW2 only
+		// DW2 / Noir
 		pp -= 1;			// 2 parameters
 		if (*pResumeState == RES_1 && pic->resumeCode == RES_WAITING) {
 			bool result;


Commit: 5b2c2637fcc025b7919c03cc0b0bfa28d45baa0a
    https://github.com/scummvm/scummvm/commit/5b2c2637fcc025b7919c03cc0b0bfa28d45baa0a
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-06T13:26:30+01:00

Commit Message:
TINSEL: Map SHOWTAG

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index aa6f123d91..c5c1daec8d 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4398,6 +4398,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		mapping = NoirMapping{"SHOWMENU", SHOWMENU, 0};
 		debug(7, "%s()", mapping.name);
 		break;
+	case 163:
+		mapping = NoirMapping{"SHOWTAG", SHOWTAG, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(%d)", mapping.name, pp[0]);
+		break;
 	case 167:
 		mapping = NoirMapping{"STARTPROCESS", STARTPROCESS, 1};
 		pp -= mapping.numArgs - 1;
@@ -5621,7 +5626,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return 0;
 
 	case SHOWTAG:
-		// DW2 only
+		// DW2 / Noir
 		if (*pResumeState == RES_1 && pic->resumeCode == RES_WAITING) {
 			*pResumeState = RES_NOT;
 			FinishWaiting(coroParam, pic);