[Scummvm-git-logs] scummvm-tools master -> dbb73e8d347738c2626020070f72faa5fc01e213
sdelamarre
noreply at scummvm.org
Fri Apr 3 11:56:51 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm-tools' repo located at https://api.github.com/repos/scummvm/scummvm-tools .
Summary:
2d86e83891 GOB: Add o7_copyDataToClipboard and o7_resolvePath opcodes to degob
442acaff01 GOB: Add o7_getVmdCurrentFrameRect opcode to degob
dbb73e8d34 GOB: Add o7_calculator opcode to degob
Commit: 2d86e838915625d58694085b3a5e14cd9fed470f
https://github.com/scummvm/scummvm-tools/commit/2d86e838915625d58694085b3a5e14cd9fed470f
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-04-03T13:56:44+02:00
Commit Message:
GOB: Add o7_copyDataToClipboard and o7_resolvePath opcodes to degob
Changed paths:
engines/gob/degob_script.h
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script.h b/engines/gob/degob_script.h
index 8fbbacdf..eb0916ea 100644
--- a/engines/gob/degob_script.h
+++ b/engines/gob/degob_script.h
@@ -678,6 +678,7 @@ protected:
void o7_startAdi4Application(FuncParams ¶ms);
void o7_xorDeobfuscate(FuncParams ¶ms);
void o7_xorObfuscate(FuncParams ¶ms);
+ void o7_resolvePath(FuncParams ¶ms);
};
#endif // DEGOB_SCRIPT_H
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index a218dc97..9e78ffee 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -87,6 +87,7 @@ const int Script_v7::_goblinFuncLookUp[][2] = {
{603, 55},
{604, 56},
{605, 57},
+ {782, 0},
{1000, 58},
{1001, 59},
{1002, 60},
@@ -107,6 +108,7 @@ const int Script_v7::_goblinFuncLookUp[][2] = {
{406, 75},
{407, 76},
{408, 77},
+ {410, 78},
};
Script_v7::Script_v7(byte *totData, uint32 totSize, ExtTable *extTable) :
@@ -302,7 +304,7 @@ void Script_v7::setupOpcodes() {
{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}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_copyDataToClipboard), {PARAM_EXPR}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
{OPCODET(o7_setVolume), {PARAM_EXPR}},
/* 94 */
@@ -545,7 +547,7 @@ void Script_v7::setupOpcodes() {
{OPCODET(o1_manageDataFile), {PARAM_EXPR}},
};
- static const OpcodeGoblinEntryV7 opcodesGoblin[78] = {
+ static const OpcodeGoblinEntryV7 opcodesGoblin[79] = {
/* 00 */
{OPCODEF(o1_dummy), {PARAM_NONE}},
{OPCODET(o2_startInfogrames), {PARAM_UINT16}},
@@ -642,6 +644,7 @@ void Script_v7::setupOpcodes() {
{OPCODEF(o7_startAdi4Application), {PARAM_NONE}},
{OPCODEF(o7_xorDeobfuscate), {PARAM_NONE}},
{OPCODEF(o7_xorObfuscate), {PARAM_NONE}},
+ {OPCODEF(o7_resolvePath), {PARAM_NONE}},
};
_opcodesDrawV7 = opcodesDraw;
@@ -822,4 +825,12 @@ void Script_v7::o7_xorObfuscate(FuncParams ¶ms)
print("&var8_%d, ", 4 * readUint16());
print("%d", readUint16());
endFunc();
+}
+
+void Script_v7::o7_resolvePath(FuncParams ¶ms)
+{
+ startFunc(params);
+ print("&var8_%d, ", 4 * readUint16());
+ print("&var8_%d", 4 * readUint16());
+ endFunc();
}
\ No newline at end of file
Commit: 442acaff01a4fa0fe9cd34f88143859c27f40adc
https://github.com/scummvm/scummvm-tools/commit/442acaff01a4fa0fe9cd34f88143859c27f40adc
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-04-03T13:56:44+02:00
Commit Message:
GOB: Add o7_getVmdCurrentFrameRect opcode to 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 9e78ffee..d7452b8b 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -299,7 +299,7 @@ void Script_v7::setupOpcodes() {
{OPCODET(o7_findCDFile),{PARAM_VARINDEX, PARAM_VARINDEX}},
/* 8C */
{OPCODET(o7_getSystemProperty), {PARAM_EXPR, PARAM_VARINDEX}},
- {TYPE_NONE, 0, 0, {PARAM_NONE}},
+ {OPCODET(o7_getVmdCurrentFrameRect), {PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX, PARAM_VARINDEX}},
{OPCODET(o7_getImageFileInfo), {PARAM_EXPR, PARAM_EXPR, PARAM_VARINDEX, PARAM_VARINDEX}},
{TYPE_NONE, 0, 0, {PARAM_NONE}},
/* 90 */
Commit: dbb73e8d347738c2626020070f72faa5fc01e213
https://github.com/scummvm/scummvm-tools/commit/dbb73e8d347738c2626020070f72faa5fc01e213
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2026-04-03T13:56:44+02:00
Commit Message:
GOB: Add o7_calculator opcode to degob
Changed paths:
engines/gob/degob_script.h
engines/gob/degob_script_v7.cpp
diff --git a/engines/gob/degob_script.h b/engines/gob/degob_script.h
index eb0916ea..3af3165c 100644
--- a/engines/gob/degob_script.h
+++ b/engines/gob/degob_script.h
@@ -679,6 +679,7 @@ protected:
void o7_xorDeobfuscate(FuncParams ¶ms);
void o7_xorObfuscate(FuncParams ¶ms);
void o7_resolvePath(FuncParams ¶ms);
+ void o7_calculator(FuncParams ¶ms);
};
#endif // DEGOB_SCRIPT_H
diff --git a/engines/gob/degob_script_v7.cpp b/engines/gob/degob_script_v7.cpp
index d7452b8b..be89f556 100644
--- a/engines/gob/degob_script_v7.cpp
+++ b/engines/gob/degob_script_v7.cpp
@@ -109,6 +109,7 @@ const int Script_v7::_goblinFuncLookUp[][2] = {
{407, 76},
{408, 77},
{410, 78},
+ {457, 79},
};
Script_v7::Script_v7(byte *totData, uint32 totSize, ExtTable *extTable) :
@@ -547,7 +548,7 @@ void Script_v7::setupOpcodes() {
{OPCODET(o1_manageDataFile), {PARAM_EXPR}},
};
- static const OpcodeGoblinEntryV7 opcodesGoblin[79] = {
+ static const OpcodeGoblinEntryV7 opcodesGoblin[80] = {
/* 00 */
{OPCODEF(o1_dummy), {PARAM_NONE}},
{OPCODET(o2_startInfogrames), {PARAM_UINT16}},
@@ -645,6 +646,7 @@ void Script_v7::setupOpcodes() {
{OPCODEF(o7_xorDeobfuscate), {PARAM_NONE}},
{OPCODEF(o7_xorObfuscate), {PARAM_NONE}},
{OPCODEF(o7_resolvePath), {PARAM_NONE}},
+ {OPCODEF(o7_calculator), {PARAM_NONE}},
};
_opcodesDrawV7 = opcodesDraw;
@@ -833,4 +835,13 @@ void Script_v7::o7_resolvePath(FuncParams ¶ms)
print("&var8_%d, ", 4 * readUint16());
print("&var8_%d", 4 * readUint16());
endFunc();
+}
+
+void Script_v7::o7_calculator(FuncParams ¶ms)
+{
+ startFunc(params);
+ print("&var8_%d, ", 4 * readUint16());
+ print("&var8_%d, ", 4 * readUint16());
+ print("var32_%d", 4 * readUint16());
+ endFunc();
}
\ No newline at end of file
More information about the Scummvm-git-logs
mailing list