[Scummvm-git-logs] scummvm master -> 0047173d294f25576d984695a046c08738fe73b6
somaen
einarjohants at gmail.com
Fri Feb 12 22:29:31 UTC 2021
This automated email contains information about 9 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f49587ba6e TINSEL: Map CDCHANGESCENE
bcb8464653 TINSEL: Map and stub SETSYSTEMREEL
88431fa460 TINSEL: Stub library functions 210, 212, 213
26272acc7f TINSEL: Map DECLEAD
aae70d323f TINSEL: Map and stub DEC3D
858e103e3e TINSEL: Map DECTAGFONT
86c46950bc TINSEL: Map DECTALKFONT
8f56936ad2 TINSEL: Map ACTORRGB
0047173d29 TINSEL: Map DECLARELANGUAGE
Commit: f49587ba6e6dd328e815de9512a4776627710115
https://github.com/scummvm/scummvm/commit/f49587ba6e6dd328e815de9512a4776627710115
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T22:54:01+01:00
Commit Message:
TINSEL: Map CDCHANGESCENE
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index c79f69f1b0..3184163e03 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4180,6 +4180,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
// this is convenient for debug.
NoirMapping mapping;
switch (libCode) {
+ case 28:
+ mapping = NoirMapping{"CDCHANGESCENE", CDCHANGESCENE, 1};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(0x%08X)", mapping.name, pp[0]);
+ break;
case 153:
mapping = NoirMapping{"SETSYSTEMVAR", SETSYSTEMVAR, 2};
pp -= mapping.numArgs - 1;
@@ -4422,7 +4427,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -1;
case CDCHANGESCENE:
- // DW2 only
+ // DW2 / Noir
CdChangeScene(pp[0]);
return -1;
Commit: bcb846465373cd4d6bd478b4c1fad8943d57bc51
https://github.com/scummvm/scummvm/commit/bcb846465373cd4d6bd478b4c1fad8943d57bc51
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:09:28+01:00
Commit Message:
TINSEL: Map and stub SETSYSTEMREEL
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 3184163e03..534221cd32 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -2694,6 +2694,13 @@ static void SetPalette(SCNHANDLE hPal, bool escOn, int myEscape) {
_vm->_bg->ChangePalette(hPal);
}
+/**
+ * Set system reel
+ */
+static void SetSystemReel(int index, SCNHANDLE reel) {
+ warning("SetSystemReel(%d, %08X), STUBBED", index, reel);
+}
+
/**
* SetSystemString
*/
@@ -4185,6 +4192,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
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;
+ debug(7, "%s(%d, 0x%08X)", mapping.name, pp[0], pp[1]);
+ break;
case 153:
mapping = NoirMapping{"SETSYSTEMVAR", SETSYSTEMVAR, 2};
pp -= mapping.numArgs - 1;
@@ -5219,6 +5231,16 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -1;
}
+ case SETSYSTEMREEL:
+ // Noir only
+ if (TinselV3) {
+ pp -= 1;
+ SetSystemReel(pp[0], pp[1]);
+ return -2;
+ } else {
+ error("SETSYSTEMREEL is only used in Noir");
+ }
+
case SETSYSTEMSTRING:
// DW2 only
pp -= 1; // 2 parameters
Commit: 88431fa46089cb810004d43b627b4e1633cebd53
https://github.com/scummvm/scummvm/commit/88431fa46089cb810004d43b627b4e1633cebd53
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:11:04+01:00
Commit Message:
TINSEL: Stub library functions 210, 212, 213
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 534221cd32..e22abbccee 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4202,6 +4202,21 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(%d, 0x%08X)", mapping.name, pp[0], pp[1]);
break;
+ case 210: // STUBBED
+ mapping = NoirMapping{"OP210", ZZZZZZ, 8};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3], pp[4], pp[5], pp[6], pp[7]);
+ break;
+ case 212: // STUBBED
+ mapping = NoirMapping{"OP212", ZZZZZZ, 8};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3], pp[4], pp[5], pp[6], pp[7]);
+ break;
+ case 213: // STUBBED
+ mapping = NoirMapping{"OP213", ZZZZZZ, 8};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2], pp[3], pp[4], pp[5], pp[6], pp[7]);
+ break;
default:
error("Unmapped libCode %d", libCode);
}
Commit: 26272acc7f8fa2de5273e91eea57ea08f26474c1
https://github.com/scummvm/scummvm/commit/26272acc7f8fa2de5273e91eea57ea08f26474c1
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:13:39+01:00
Commit Message:
TINSEL: Map DECLEAD
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index e22abbccee..c6cd80cec5 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4192,6 +4192,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(0x%08X)", mapping.name, pp[0]);
break;
+ case 46:
+ mapping = NoirMapping{"DECLEAD", DECLEAD, 1};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(%d)", mapping.name, pp[0]);
+ break;
case 151:
mapping = NoirMapping{"SETSYSTEMREEL", SETSYSTEMREEL, 2};
pp -= mapping.numArgs - 1;
@@ -4574,7 +4579,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -3;
case DECLEAD:
- // Common to both DW1 & DW2
+ // Common to DW1 / DW2 / Noir
if (TinselV2) {
DecLead(pp[0]);
return -1;
Commit: aae70d323ffd96d0f5db3ea29bbe46ee7e78d0a7
https://github.com/scummvm/scummvm/commit/aae70d323ffd96d0f5db3ea29bbe46ee7e78d0a7
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:17:57+01:00
Commit Message:
TINSEL: Map and stub DEC3D
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index c6cd80cec5..7f5a74a53e 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -152,7 +152,7 @@ enum MASTER_LIB_CODES {
THISOBJECT, THISTAG, TIMER, TOPIC, TOPPLAY, TOPWINDOW, TRANSLUCENTINDEX,
TRYPLAYSAMPLE, UNDIMMUSIC, UNHOOKSCENE, UNTAGACTOR, VIBRATE, WAITFRAME, WAITKEY,
WAITSCROLL, WAITTIME, WALK, WALKED, WALKEDPOLY, WALKEDTAG, WALKINGACTOR, WALKPOLY,
- WALKTAG, WALKXPOS, WALKYPOS, WHICHCD, WHICHINVENTORY, ZZZZZZ,
+ WALKTAG, WALKXPOS, WALKYPOS, WHICHCD, WHICHINVENTORY, ZZZZZZ, DEC3D,
HIGHEST_LIBCODE
};
@@ -4197,6 +4197,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(%d)", mapping.name, pp[0]);
break;
+ case 47:
+ mapping = NoirMapping{"DEC3D", DEC3D, 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;
@@ -4527,6 +4532,11 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
// DW1 only
error("cutscene isn't a real function");
+ case DEC3D:
+ // Noir only
+ warning("TODO: Implement DEC3D");
+ return -3;
+
case DECCONVW:
// Common to both DW1 & DW2
pp -= 7; // 8 parameters
Commit: 858e103e3e7ac8b874c2c3c2992a2283bf90ef63
https://github.com/scummvm/scummvm/commit/858e103e3e7ac8b874c2c3c2992a2283bf90ef63
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:21:25+01:00
Commit Message:
TINSEL: Map DECTAGFONT
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 7f5a74a53e..907bf3b355 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4202,6 +4202,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(0x%08X)", mapping.name, pp[0]);
break;
+ case 48:
+ mapping = NoirMapping{"DECTAGFONT", DECTAGFONT, 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;
@@ -4608,7 +4613,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -14;
case DECTAGFONT:
- // Common to both DW1 & DW2
+ // Common to DW1 / DW2 / Noir
_vm->_font->SetTagFontHandle(pp[0]);
return -1;
Commit: 86c46950bcbf3d1087408f13969e4bd4a66909e1
https://github.com/scummvm/scummvm/commit/86c46950bcbf3d1087408f13969e4bd4a66909e1
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:23:29+01:00
Commit Message:
TINSEL: Map DECTALKFONT
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 907bf3b355..c24c39f9b5 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4207,6 +4207,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(0x%08X)", mapping.name, pp[0]);
break;
+ case 49:
+ mapping = NoirMapping{"DECTALKFONT", DECTALKFONT, 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;
@@ -4618,7 +4623,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -1;
case DECTALKFONT:
- // Common to both DW1 & DW2
+ // Common to DW1 / DW2 / Noir
_vm->_font->SetTalkFontHandle(pp[0]);
return -1;
Commit: 8f56936ad2730b6f375dc4733d2d32dccdf1d905
https://github.com/scummvm/scummvm/commit/8f56936ad2730b6f375dc4733d2d32dccdf1d905
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:26:30+01:00
Commit Message:
TINSEL: Map ACTORRGB
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index c24c39f9b5..7bf51cb718 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4187,6 +4187,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
// this is convenient for debug.
NoirMapping mapping;
switch (libCode) {
+ case 5:
+ mapping = NoirMapping{"ACTORRGB", ACTORRGB, 2};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(%d, 0x%08X)", mapping.name, pp[0], pp[1]);
+ break;
case 28:
mapping = NoirMapping{"CDCHANGESCENE", CDCHANGESCENE, 1};
pp -= mapping.numArgs - 1;
@@ -4311,7 +4316,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return 0;
case ACTORRGB:
- // DW2 only
+ // Common to DW2 / Noir
pp -= 1; // 2 parameters
ActorRGB(pp[0], pp[1]);
return -2;
Commit: 0047173d294f25576d984695a046c08738fe73b6
https://github.com/scummvm/scummvm/commit/0047173d294f25576d984695a046c08738fe73b6
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2021-02-12T23:28:12+01:00
Commit Message:
TINSEL: Map DECLARELANGUAGE
Changed paths:
engines/tinsel/tinlib.cpp
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 7bf51cb718..f0d28efbd2 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -4197,6 +4197,11 @@ NoirMapping translateNoirLibCode(int libCode, int32 *pp) {
pp -= mapping.numArgs - 1;
debug(7, "%s(0x%08X)", mapping.name, pp[0]);
break;
+ case 45:
+ mapping = NoirMapping{"DECLARELANGUAGE", DECLARELANGUAGE, 3};
+ pp -= mapping.numArgs - 1;
+ debug(7, "%s(%d, 0x%08X, 0x%08X)", mapping.name, pp[0], pp[1], pp[2]);
+ break;
case 46:
mapping = NoirMapping{"DECLEAD", DECLEAD, 1};
pp -= mapping.numArgs - 1;
@@ -4598,7 +4603,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi
return -1;
case DECLARELANGUAGE:
- // DW2 only
+ // Common to DW2 & Noir
pp -= 2; // 3 parameters
DeclareLanguage(pp[0], pp[1], pp[2]);
return -3;
More information about the Scummvm-git-logs
mailing list