[Scummvm-git-logs] scummvm master -> 8a5c567d7c9732d9abddb960f8bc000c7824eb8f

[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:
2612eeebf6 TINSEL: Correct the mapping for ZZZZZZ (it has one argument)
c101363240 TINSEL: Stub OPENNOTEBOOK (Noir)
8a5c567d7c TINSEL: Enable the language scene.


Commit: 2612eeebf66372588c041313166964e19b06104b
    https://github.com/scummvm/scummvm/commit/2612eeebf66372588c041313166964e19b06104b
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2022-05-06T19:39:23+02:00

Commit Message:
TINSEL: Correct the mapping for ZZZZZZ (it has one argument)

Changed paths:
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index ed416cb20b2..407a8f729ee 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -5208,7 +5208,7 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		debug(7, "%s()", mapping.name);
 		break;
 	case 209:
-		mapping = NoirMapping{"ZZZZZZ", ZZZZZZ, 0};
+		mapping = NoirMapping{"ZZZZZZ", ZZZZZZ, 1};
 		debug(7, "%s()", mapping.name);
 		break;
 	case 210: // STUBBED


Commit: c101363240f3da64b6a7863d0e02df2930dcdc83
    https://github.com/scummvm/scummvm/commit/c101363240f3da64b6a7863d0e02df2930dcdc83
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2022-05-06T19:39:24+02:00

Commit Message:
TINSEL: Stub OPENNOTEBOOK (Noir)

Changed paths:
    engines/tinsel/noir/notebook.cpp
    engines/tinsel/noir/notebook.h
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/noir/notebook.cpp b/engines/tinsel/noir/notebook.cpp
index 7a2d988b6d2..138609c7267 100644
--- a/engines/tinsel/noir/notebook.cpp
+++ b/engines/tinsel/noir/notebook.cpp
@@ -59,4 +59,9 @@ void Notebook::AddHyperlink(int32 id1, int32 id2) {
 	error("Too many hyperlinks");
 }
 
+
+void Notebook::Show(bool isOpen) {
+	error("TODO: Implement Notebook::Show()");
+}
+
 } // End of namespace Tinsel
diff --git a/engines/tinsel/noir/notebook.h b/engines/tinsel/noir/notebook.h
index 10a57441690..0553cb327f0 100644
--- a/engines/tinsel/noir/notebook.h
+++ b/engines/tinsel/noir/notebook.h
@@ -62,7 +62,8 @@ public:
 	void Redraw();
 	// Called by EventToInventory
 	void EventToNotebook(PLR_EVENT event, bool p2, bool p3);
-
+	// Called from OPENNOTEBOOK
+	void Show(bool isOpen);
 private:
 	const static uint32 MAX_ENTRIES = 100;
 	const static uint32 MAX_PAGES = 0x15;
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 407a8f729ee..05a14d61b56 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -155,7 +155,7 @@ enum MASTER_LIB_CODES {
 	WAITSCROLL, WAITTIME, WALK, WALKED, WALKEDPOLY, WALKEDTAG, WALKINGACTOR, WALKPOLY,
 	WALKTAG, WALKXPOS, WALKYPOS, WHICHCD, WHICHINVENTORY, ZZZZZZ, DEC3D, DECINVMAIN,
 	ADDNOTEBOOK, ADDINV3, ADDCONV, SET3DTEXTURE, FADEMUSIC, VOICEOVER, SETVIEW,
-	HELDOBJECTORTOPIC, BOOKADDHYPERLINK, HIGHEST_LIBCODE
+	HELDOBJECTORTOPIC, BOOKADDHYPERLINK, OPENNOTEBOOK, HIGHEST_LIBCODE
 };
 
 static const MASTER_LIB_CODES DW1DEMO_CODES[] = {
@@ -4729,7 +4729,8 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3]);
 		break;
 	case 103: // 0 parameters
-		error("Unsupported libCode %d open_notebook", libCode);
+		mapping = NoirMapping{"OPENNOTEBOOK", OPENNOTEBOOK, 0};
+		debug(7, "%s()", mapping.name);
 	case 104: // 1 parameter
 		error("Unsupported libCode %d OFFSET variant", libCode);
 	case 105: // 0 parameters
@@ -6039,6 +6040,11 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
 		pp[0] = OtherObject(pic->pinvo);
 		return 0;
 
+	case OPENNOTEBOOK:
+		// Noir only
+		_vm->_notebook->Show(0);
+		return 0;
+
 	case PAUSE:
 		// DW2 only
 		WaitTime(coroParam, 1, true, pic->escOn, pic->myEscape);


Commit: 8a5c567d7c9732d9abddb960f8bc000c7824eb8f
    https://github.com/scummvm/scummvm/commit/8a5c567d7c9732d9abddb960f8bc000c7824eb8f
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2022-05-06T19:39:24+02:00

Commit Message:
TINSEL: Enable the language scene.

It depended on INVPLAY to be mapped.

Changed paths:
    engines/tinsel/dialogs.cpp
    engines/tinsel/tinlib.cpp


diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 00539445083..1f8fdd74dbe 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -5239,13 +5239,9 @@ void Dialogs::idec_invMain(SCNHANDLE text, int MaxContents) {
 			72, false);
 
 	warning("TODO: idec_invMain: implement language scene playback");
-	// This is not yet actived because playing the loadsceen scene
-	// currently produces an invalid corountine stack.
-#if 0
 	const char *fileName = _vm->getSceneFile(TextLanguage());
 	SCNHANDLE sceneHandle = _vm->_handle->FindLanguageSceneHandle(fileName);
 	DoHailScene(sceneHandle);
-#endif
 }
 
 /**
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 05a14d61b56..9e086740b34 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4675,9 +4675,9 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
 		debug(7, "%s(%d)", mapping.name, pp[0]);
 		break;
 	case 90: // 2 parameters, play anim based on item
-		mapping = NoirMapping{"INVPLAY", ZZZZZZ, 2};
+		mapping = NoirMapping{"INVPLAY", INVPLAY, 2};
 		pp -= mapping.numArgs - 1;
-		debug(7, "%s(%d, %d)", mapping.name, pp[0], pp[1]);
+		debug(7, "%s(%d %d)", mapping.name, pp[0], pp[1]);
 		break;
 	case 91:
 		mapping = NoirMapping{"INWHICHINV", INWHICHINV, 0};