[Scummvm-git-logs] scummvm-tools master -> 3d9fc475ac6810cc7d28f9aaa21f6f1d8f3ed2af
sdelamarre
noreply at scummvm.org
Tue Jul 16 21:44:08 UTC 2024
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
1ce69c763d GOB: Add Adibou2/Anglais opcodes in degob
1e82f08ea8 GOB: Add Adibou2/Musique opcodes in degob
3f57996b6a GOB: Add an Adibou2/Science opcode in degob
0bd27afd1b GOB: Fix var index not being displayed in some cases in degob
3d9fc475ac GOB: Fix o7_getDBString opcode in degob
Commit: 1ce69c763d31e6f17024198dbf35a767ffc6002a
https://github.com/scummvm/scummvm-tools/commit/1ce69c763d31e6f17024198dbf35a767ffc6002a
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2024-07-16T23:40:58+02:00
Commit Message:
GOB: Add Adibou2/Anglais opcodes in degob
Changed paths:
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index 5eb12bcc..12ebb566 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -294,7 +294,7 @@ void Script_v7::setupOpcodes() {
/* 8C */
{OPCODET(o7_getSystemProperty), {PARAM_EXPR, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_getImageFileInfo), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* 90 */
{OPCODET(o7_loadImage), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
@@ -317,7 +317,7 @@ void Script_v7::setupOpcodes() {
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* A0 */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xA0), {PARAM_EXPR, PARAM_VARINDEX, PARAM_EXPR}},
{OPCODET(o7_getINIValue), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
{OPCODET(o7_setINIValue), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
@@ -329,22 +329,22 @@ void Script_v7::setupOpcodes() {
/* A8 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xAA), {PARAM_EXPR, PARAM_EXPR}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* AC */
+ {OPCODET(o7_draw0xAC), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+ {OPCODET(o7_draw0xAD), {PARAM_EXPR, PARAM_EXPR}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xAF), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
/* B0 */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xB0), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+ {OPCODET(o7_draw0xB1), {PARAM_EXPR, PARAM_EXPR}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* B4 */
+ {OPCODET(o7_draw0xB4), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xB6), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* B8 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
@@ -372,9 +372,9 @@ void Script_v7::setupOpcodes() {
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* CC */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xCC), {PARAM_VARINDEX}},
+ {OPCODET(o7_draw0xCD), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+ {OPCODET(o7_draw0xCE), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* D0 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
@@ -392,17 +392,17 @@ void Script_v7::setupOpcodes() {
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* DC */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xDC), {PARAM_EXPR, PARAM_VARINDEX}},
+ {OPCODET(o7_draw0xDD), {PARAM_EXPR}},
+ {OPCODET(o7_draw0xDE), {PARAM_EXPR, PARAM_EXPR}},
+ {OPCODET(o7_draw0xDF), {PARAM_EXPR}},
/* E0 */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xE0), {PARAM_NONE}},
+ {OPCODET(o7_draw0xE1), {PARAM_NONE}},
+ {OPCODET(o7_draw0xE2), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+ {OPCODET(o7_draw0xE3), {PARAM_NONE}},
/* E4 */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xE4), {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
Commit: 1e82f08ea8e1e08f144c1991f954db13ec6122f9
https://github.com/scummvm/scummvm-tools/commit/1e82f08ea8e1e08f144c1991f954db13ec6122f9
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2024-07-16T23:40:58+02:00
Commit Message:
GOB: Add Adibou2/Musique opcodes in degob
Changed paths:
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index 12ebb566..181548d6 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -334,7 +334,7 @@ void Script_v7::setupOpcodes() {
/* AC */
{OPCODET(o7_draw0xAC), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
{OPCODET(o7_draw0xAD), {PARAM_EXPR, PARAM_EXPR}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xAE), {PARAM_EXPR, PARAM_EXPR}},
{OPCODET(o7_draw0xAF), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
/* B0 */
{OPCODET(o7_draw0xB0), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
@@ -403,9 +403,9 @@ void Script_v7::setupOpcodes() {
{OPCODET(o7_draw0xE3), {PARAM_NONE}},
/* E4 */
{OPCODET(o7_draw0xE4), {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_draw0xE5), {PARAM_NONE}},
+ {OPCODET(o7_draw0xE6), {PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
+ {OPCODET(o7_draw0xE7), {PARAM_VARINDEX}},
/* E8 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
@@ -429,8 +429,8 @@ void Script_v7::setupOpcodes() {
/* F8 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_vmdGetSoundBuffer), {PARAM_VARINDEX}},
+ {OPCODET(o7_vmdReleaseSoundBuffer), {PARAM_EXPR, PARAM_VARINDEX}},
/* FC */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
Commit: 3f57996b6a6db14475024acf1a9d437001d161c5
https://github.com/scummvm/scummvm-tools/commit/3f57996b6a6db14475024acf1a9d437001d161c5
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2024-07-16T23:40:58+02:00
Commit Message:
GOB: Add an Adibou2/Science opcode in degob
Changed paths:
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index 181548d6..6752a2bb 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -608,7 +608,7 @@ void Script_v7::setupOpcodes() {
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* 34 */
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_getFreeDiskSpace), {PARAM_UINT16}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
Commit: 0bd27afd1b488c05d1ff6987aee10c707f38a324
https://github.com/scummvm/scummvm-tools/commit/0bd27afd1b488c05d1ff6987aee10c707f38a324
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2024-07-16T23:40:58+02:00
Commit Message:
GOB: Fix var index not being displayed in some cases in degob
Changed paths:
engines/gob/degob_script.cpp
diff --git a/engines/gob/degob_script.cpp b/engines/gob/degob_script.cpp
index e3ecd4d9..05b8a42e 100644
--- a/engines/gob/degob_script.cpp
+++ b/engines/gob/degob_script.cpp
@@ -633,7 +633,7 @@ std::string Script::readVarIndex(uint16 *arg_0, uint16 *arg_4) {
skip(2);
if (peekUint8() != 97)
- return expr;
+ return pref;
skip(1);
} else if (operation == 15) {
@@ -655,7 +655,7 @@ std::string Script::readVarIndex(uint16 *arg_0, uint16 *arg_4) {
pref += "#";
if (peekUint8() != 97)
- return expr;
+ return pref;
skip(1);
}
Commit: 3d9fc475ac6810cc7d28f9aaa21f6f1d8f3ed2af
https://github.com/scummvm/scummvm-tools/commit/3d9fc475ac6810cc7d28f9aaa21f6f1d8f3ed2af
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2024-07-16T23:40:58+02:00
Commit Message:
GOB: Fix o7_getDBString opcode in degob
Changed paths:
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index 6752a2bb..7bc39ef8 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -364,7 +364,7 @@ void Script_v7::setupOpcodes() {
/* C4 */
{OPCODET(o7_opendBase), {PARAM_EXPR, PARAM_EXPR}},
{OPCODET(o7_closedBase), {PARAM_EXPR}},
- {OPCODET(o7_getDBString), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR}},
+ {OPCODET(o7_getDBString), {PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* C8 */
{TYPE_NONE, 0, 0, {PARAM_NONE}},
More information about the Scummvm-git-logs
mailing list