From 70aa0e793da20ee5539486cbdc8461f3f0cfafcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Einar=20Johan=20Tr=C3=B8an=20S=C3=B8ma=CC=8Aen?= Date: Tue, 16 Feb 2021 22:57:44 +0100 Subject: [PATCH] TINSEL: Map and stub PLAYMUSIC --- engines/tinsel/tinlib.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 17daa33e561..57c4015fc25 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -1661,6 +1661,10 @@ static void PlayMovie(CORO_PARAM, SCNHANDLE hFileStem, int myEscape) { * Play some music */ static void PlayMusic(int tune) { + if (TinselV3) { + warning("TODO: Implement PLAYMUSIC(%d) for Noir", tune); + return; + } _vm->_pcmMusic->startPlay(tune); } @@ -4266,6 +4270,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) { pp -= mapping.numArgs - 1; debug(7, "%s(0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2]); break; + case 112: + mapping = NoirMapping{"PLAYMUSIC", PLAYMUSIC, 1}; + pp -= mapping.numArgs - 1; + debug(7, "%s(0x%08X)", mapping.name, pp[0]); + break; case 151: mapping = NoirMapping{"SETSYSTEMREEL", SETSYSTEMREEL, 2}; pp -= mapping.numArgs - 1; @@ -5083,7 +5092,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi return -1; case PLAYMUSIC: - // DW2 only + // DW2 / Noir only PlayMusic(pp[0]); return -1;