[Scummvm-git-logs] scummvm master -> 040ab7f68b3258395a7eaa5d49456bbab40c5096

[somaen]

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

Summary:
bb4ce21bb0 TINSEL: Map HAVE
040ab7f68b TINSEL: Map STAND


Commit: bb4ce21bb07475f998b4a19f03c5dd88089ab732
    https://github.com/scummvm/scummvm/commit/bb4ce21bb07475f998b4a19f03c5dd88089ab732
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-08T23:03:22+01:00

Commit Message:
TINSEL: Map HAVE

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 59200123da..1f9298a38f 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4357,6 +4357,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%08X, %d)", mapping.name, pp[0], pp[1]);
 		break;
+	case 74:
+		mapping = NoirMapping{"HAVE", HAVE, 1};
+		pp -= mapping.numArgs - 1;
+		debug(7, "%s(%d)", mapping.name, pp[0]);
+		break;
 	case 77:
 		mapping = NoirMapping{"HIDEACTOR", HIDEACTOR, 1};
 		pp -= mapping.numArgs - 1;
@@ -5047,7 +5052,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return 0;
 
 	case HAVE:
-		// DW2 only
+		// DW2 / Noir
 		pp[0] = Have(pp[0]);
 		return 0;			// using return value
 


Commit: 040ab7f68b3258395a7eaa5d49456bbab40c5096
    https://github.com/scummvm/scummvm/commit/040ab7f68b3258395a7eaa5d49456bbab40c5096
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-03-08T23:03:23+01:00

Commit Message:
TINSEL: Map STAND

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 1f9298a38f..67fd6db8c0 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4451,6 +4451,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		pp -= mapping.numArgs - 1;
 		debug(7, "%s(%d)", mapping.name, pp[0]);
 		break;
+	case 164:
+		mapping = NoirMapping{"STAND", STAND, 4};
+		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 167:
 		mapping = NoirMapping{"STARTPROCESS", STARTPROCESS, 1};
 		pp -= mapping.numArgs - 1;
@@ -5708,7 +5713,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		return -7;
 
 	case STAND:
-		// Common to both DW1 & DW2
+		// Common to DW1 / DW2 / Noir
 		pp -= 3;			// 4 parameters
 		Stand(coroParam, pp[0], pp[1], pp[2], pp[3]);
 		return -4;