[Scummvm-git-logs] scummvm master -> 32c4ee5588cbfd60aeb821a626a724c1abadf36a

[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:
c4fbd14b9e TINSEL: Map PRINTTAG
0876f73eaa TINSEL: Fix off-by-one in RANDOM logging
32c4ee5588 TINSEL: Map POSTTAG


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

Commit Message:
TINSEL: Map PRINTTAG

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index c5c1daec8d..b2303157e9 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4369,6 +4369,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3]);
 		break;
+	case 124:
+		mapping = NoirMapping{"PRINTTAG", PRINTTAG, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(%d)", mapping.name, pp[0]);
+		break;
 	case 128:
 		mapping = NoirMapping{"RANDOM", RANDOM, 2};
 		pp -= mapping.numArgs - 1;
@@ -5351,8 +5356,8 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return -1;
 
 	case PRINTTAG:
-		// Common to both DW1 & DW2
-		PrintTag(pic->hPoly, pp[0], TinselV2 ? pic->idActor : 0, false);
+		// Common to DW1 / DW2 / Noir
+		PrintTag(pic->hPoly, pp[0], TinselV2 ? pic->idActor : 0,  TinselV3 ? true : false);
 		return -1;
 
 	case QUITGAME:


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

Commit Message:
TINSEL: Fix off-by-one in RANDOM logging

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index b2303157e9..ab30fdbc79 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4375,7 +4375,7 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		debug(7, "%s(%d)", mapping.name, pp[0]);
 		break;
 	case 128:
-		mapping = NoirMapping{"RANDOM", RANDOM, 2};
+		mapping = NoirMapping{"RANDOM", RANDOM, 3};
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%d, %d, %d)", mapping.name, pp[0], pp[1], pp[2]);
 		break;


Commit: 32c4ee5588cbfd60aeb821a626a724c1abadf36a
    https://github.com/scummvm/scummvm/commit/32c4ee5588cbfd60aeb821a626a724c1abadf36a
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-06T15:04:52+01:00

Commit Message:
TINSEL: Map POSTTAG

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index ab30fdbc79..a78718482c 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4369,6 +4369,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3]);
 		break;
+	case 121:
+		mapping = NoirMapping{"POSTTAG", POSTTAG, 2};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(0x%08X, 0x%08X)", mapping.name, pp[0], pp[1]);
+		break;
 	case 124:
 		mapping = NoirMapping{"PRINTTAG", PRINTTAG, 1};
 		pp -= mapping.numArgs - 1;
@@ -5321,7 +5326,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return -2;
 
 	case POSTTAG:
-		// DW2 only
+		// DW2 / Noir
 		pp -= 1;			// 2 parameters
 		PostTag(coroParam, pp[0], (TINSEL_EVENT)pp[1], pic->hPoly, pic->myEscape);
 		return -2;