[Scummvm-git-logs] scummvm master -> 944dcd276ee8bfa8b32d99e73f6623ec576ba3a8

[somaen]

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

Summary:
760c22c5fc TINSEL: Map SHOWACTOR
103436dc90 TINSEL: Map HIDEACTOR
c0d5ca6fad TINSEL: Map ENDACTOR
944dcd276e TINSEL: Map KILLPROCESS


Commit: 760c22c5fc4f71be4e3cce5da0de06460ec39f57
    https://github.com/scummvm/scummvm/commit/760c22c5fc4f71be4e3cce5da0de06460ec39f57
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-28T00:20:49+01:00

Commit Message:
TINSEL: Map SHOWACTOR

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 7224ce5914..b6f1f61f67 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4325,6 +4325,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%d, 0x%08X)", mapping.name, pp[0], pp[1]);
 		break;
+	case 156:
+		mapping = NoirMapping{"SHOWACTOR", SHOWACTOR, 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;
@@ -5462,7 +5467,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return 0;
 
 	case SHOWACTOR:
-		// DW2 only
+		// DW2 & Noir
 		if (*pResumeState == RES_1 && pic->resumeCode == RES_WAITING) {
 			*pResumeState = RES_NOT;
 			FinishWaiting(coroParam, pic);


Commit: 103436dc906ea558f100748dd65b9700ec1655cf
    https://github.com/scummvm/scummvm/commit/103436dc906ea558f100748dd65b9700ec1655cf
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-28T00:26:50+01:00

Commit Message:
TINSEL: Map HIDEACTOR

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index b6f1f61f67..c22fafe237 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4285,6 +4285,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		mapping = NoirMapping{"EVENT", EVENT, 0};
 		debug(7, "%s()", mapping.name);
 		break;
+	case 77:
+		mapping = NoirMapping{"HIDEACTOR", HIDEACTOR, 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;
@@ -4911,7 +4916,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return 0;
 
 	case HIDEACTOR:
-		// Common to both DW1 & DW2
+		// Common to DW1 / DW2 / Noir
 		if (!TinselV2)
 			HideActorFn(coroParam, pp[0]);
 		else if (*pResumeState == RES_1 && pic->resumeCode == RES_WAITING) {


Commit: c0d5ca6fadc8abf2fe3afb2f820aba0a82c2e81d
    https://github.com/scummvm/scummvm/commit/c0d5ca6fadc8abf2fe3afb2f820aba0a82c2e81d
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-28T00:26:59+01:00

Commit Message:
TINSEL: Map ENDACTOR

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index c22fafe237..4cee2203c4 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4281,6 +4281,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(0x%08X)", mapping.name, pp[0]);
 		break;
+	case 58:
+		mapping = NoirMapping{"ENDACTOR", ENDACTOR, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(0x%08X)", mapping.name, pp[0]);
+		break;
 	case 61:
 		mapping = NoirMapping{"EVENT", EVENT, 0};
 		debug(7, "%s()", mapping.name);
@@ -4829,7 +4834,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return 0;
 
 	case ENDACTOR:
-		// DW2 only
+		// DW2 & Noir
 		EndActor(pp[0]);
 		return -1;
 


Commit: 944dcd276ee8bfa8b32d99e73f6623ec576ba3a8
    https://github.com/scummvm/scummvm/commit/944dcd276ee8bfa8b32d99e73f6623ec576ba3a8
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-28T00:30:29+01:00

Commit Message:
TINSEL: Map KILLPROCESS

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 4cee2203c4..5ab3a20165 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4300,6 +4300,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(0x%08X, 0x%08X)", mapping.name, pp[0], pp[1]);
 		break;
+	case 94:
+		mapping = NoirMapping{"KILLPROCESS", KILLPROCESS, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(0x%08X)", mapping.name, pp[0]);
+		break;
 	case 96:
 		mapping = NoirMapping{"MOVECURSOR", MOVECURSOR, 2};
 		pp -= mapping.numArgs - 1;
@@ -5043,7 +5048,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return -1;
 
 	case KILLPROCESS:
-		// DW2 only
+		// DW2 / Noir
 		KillProcess(pp[0]);
 		return -1;