[Scummvm-git-logs] scummvm master -> 5ac4ed82c78cbbfa683e91e8bb28e68551827e0f
mistydemeo
noreply at scummvm.org
Fri Nov 8 03:16:50 UTC 2024
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:
db8bbe153c DIRECTOR: add darlun
275e877349 DIRECTOR: remove duplicate xlib definitions
5ac4ed82c7 DEVTOOLS: update xlib stub tool types
Commit: db8bbe153c7a61f3f10e016ebfaeea3648519249
https://github.com/scummvm/scummvm/commit/db8bbe153c7a61f3f10e016ebfaeea3648519249
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2024-11-07T18:39:09-08:00
Commit Message:
DIRECTOR: add darlun
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 35e422d3c1f..70b919f137f 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1029,6 +1029,7 @@ static const PlainGameDescriptor directorGames[] = {
{ "cookieginger", "Cookie & Ginger"},
{ "crouton", "Croûton"},
{ "dan", "ãã³" }, // Dan
+ { "darlun", "Darlun's Rambling Trip" }, // aka ãã¼ã«ã³ã®ãã¾ã¾ãªæ
{ "djrom", "The DJ-ROM: Da CD-Extra of Hip-Hop Music" },
{ "digitalboy1", "Digital Boy CD-ROM Vol. 1" },
{ "digitalboy2", "Digital Boy CD-ROM Vol. 2" },
@@ -6350,6 +6351,9 @@ static const DirectorGameDescription gameDescriptions[] = {
MACGAME1("crystalskull", "", "Crystal Skull", "c148f66ae3511fb88733102aa27efe7e", 719459, 501),
WINGAME1t("crystalskull", "", "CRYS32.EXE", "3f5fd025e808943e1fa9b91ce63ef9b7", 1410495, 501),
+ MACGAME1f_l("darlun", "", "DARLUN", "4bc4f93f5c5169de9f2fee12071a68b9", 717372, Common::JA_JPN, 501, GF_32BPP),
+ WINGAME1tf_l("darlun", "", "DARLUN_P.EXE", "713a7ef3728ed1952745d204e520972a", 1440286, Common::JA_JPN, 501, GF_32BPP),
+
WINGAME2("davidsonps", "v1.0", "DPS32.EXE", "3460ad87d2ba57104e2810a77b53c220", 1401517,
"DPSHOT.DXR", "d980c9272bc723c57238a31790b71f11", 1354686, 500),
// Developed by Wag the Dog Productions
Commit: 275e877349f7fa9b514d6a6f0366f9b3701a296d
https://github.com/scummvm/scummvm/commit/275e877349f7fa9b514d6a6f0366f9b3701a296d
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2024-11-07T18:39:09-08:00
Commit Message:
DIRECTOR: remove duplicate xlib definitions
Changed paths:
R engines/director/lingo/xlibs/portaxcmd.cpp
R engines/director/lingo/xlibs/portaxcmd.h
engines/director/lingo/lingo-object.cpp
engines/director/module.mk
diff --git a/engines/director/lingo/lingo-object.cpp b/engines/director/lingo/lingo-object.cpp
index 0495584eec6..cce60542c0d 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -104,7 +104,6 @@
#include "director/lingo/xlibs/panel.h"
#include "director/lingo/xlibs/popupmenuxobj.h"
#include "director/lingo/xlibs/porta.h"
-#include "director/lingo/xlibs/portaxcmd.h"
#include "director/lingo/xlibs/prefpath.h"
#include "director/lingo/xlibs/printomatic.h"
#include "director/lingo/xlibs/processxobj.h"
@@ -276,7 +275,6 @@ static struct XLibProto {
XLIBDEF(MiscX, kXObj, 400), // D4
XLIBDEF(MMaskXObj, kXObj, 400), // D4
XLIBDEF(MoovXObj, kXObj, 300), // D3
- XLIBDEF(MovUtilsXObj, kXObj, 400), // D4
XLIBDEF(MoveMouseJPXObj, kXObj, 400), // D4
XLIBDEF(MoveMouseXObj, kXObj, 400), // D4
XLIBDEF(MovieIdxXObj, kXObj, 400), // D4
@@ -289,7 +287,6 @@ static struct XLibProto {
XLIBDEF(PanelXObj, kXObj, 200), // D2
XLIBDEF(PopUpMenuXObj, kXObj, 200), // D2
XLIBDEF(Porta, kXObj, 300), // D3
- XLIBDEF(PortaXCMD, kXObj, 300), // D3
XLIBDEF(PrefPath, kXObj, 400), // D4
XLIBDEF(PrintOMaticXObj, kXObj, 400), // D4
XLIBDEF(ProcessXObj, kXObj, 400), // D4
diff --git a/engines/director/lingo/xlibs/portaxcmd.cpp b/engines/director/lingo/xlibs/portaxcmd.cpp
deleted file mode 100644
index cde39f181c6..00000000000
--- a/engines/director/lingo/xlibs/portaxcmd.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/system.h"
-
-#include "director/director.h"
-#include "director/lingo/lingo.h"
-#include "director/lingo/lingo-object.h"
-#include "director/lingo/lingo-utils.h"
-#include "director/lingo/xlibs/portaxcmd.h"
-
-/**************************************************
- *
- * USED IN:
- * the7colors
- *
- **************************************************/
-
-namespace Director {
-
-const char *PortaXCMD::xlibName = "Porta";
-const XlibFileDesc PortaXCMD::fileNames[] = {
- { "Porta", nullptr },
- { nullptr, nullptr },
-};
-
-static BuiltinProto builtins[] = {
- { "Porta", PortaXCMD::m_Porta, -1, 0, 300, CBLTIN },
- { nullptr, nullptr, 0, 0, 0, VOIDSYM }
-};
-
-void PortaXCMD::open(ObjectType type, const Common::Path &path) {
- g_lingo->initBuiltIns(builtins);
-}
-
-void PortaXCMD::close(ObjectType type) {
- g_lingo->cleanupBuiltIns(builtins);
-}
-
-XOBJSTUB(PortaXCMD::m_Porta, 0)
-
-}
diff --git a/engines/director/lingo/xlibs/portaxcmd.h b/engines/director/lingo/xlibs/portaxcmd.h
deleted file mode 100644
index 9dc89f10f85..00000000000
--- a/engines/director/lingo/xlibs/portaxcmd.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef DIRECTOR_LINGO_XLIBS_PORTAXCMD_H
-#define DIRECTOR_LINGO_XLIBS_PORTAXCMD_H
-
-namespace Director {
-
-namespace PortaXCMD {
-
-extern const char *xlibName;
-extern const XlibFileDesc fileNames[];
-
-void open(ObjectType type, const Common::Path &path);
-void close(ObjectType type);
-
-void m_Porta(int nargs);
-
-} // End of namespace PortaXCMD
-
-} // End of namespace Director
-
-#endif
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 98db944ca45..35f1e9c71f2 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -133,7 +133,6 @@ MODULE_OBJS = \
lingo/xlibs/panel.o \
lingo/xlibs/popupmenuxobj.o \
lingo/xlibs/porta.o \
- lingo/xlibs/portaxcmd.o \
lingo/xlibs/prefpath.o \
lingo/xlibs/printomatic.o \
lingo/xlibs/processxobj.o \
Commit: 5ac4ed82c78cbbfa683e91e8bb28e68551827e0f
https://github.com/scummvm/scummvm/commit/5ac4ed82c78cbbfa683e91e8bb28e68551827e0f
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2024-11-07T18:54:25-08:00
Commit Message:
DEVTOOLS: update xlib stub tool types
The structure was updated in 96df7715e14374b8b9764b4e35cc00fad8eb63b2.
Changed paths:
devtools/director-generate-xobj-stub.py
diff --git a/devtools/director-generate-xobj-stub.py b/devtools/director-generate-xobj-stub.py
index 8e96ed642a4..6c0f21d2f4b 100755
--- a/devtools/director-generate-xobj-stub.py
+++ b/devtools/director-generate-xobj-stub.py
@@ -196,7 +196,7 @@ namespace Director {{
namespace {xobj_class} {{
extern const char *xlibName;
-extern const char *fileNames[];
+extern const XlibFileDesc fileNames[];
void open(ObjectType type, const Common::Path &path);
void close(ObjectType type);
@@ -232,9 +232,9 @@ XCMD_TEMPLATE = (
namespace Director {{
const char *{xobj_class}::xlibName = "{name}";
-const char *{xobj_class}::fileNames[] = {{
- "{filename}",
- nullptr
+const XlibFileDesc {xobj_class}::fileNames[] = {{
+ {{ "{filename}", nullptr }},
+ {{ nullptr, nullptr }}
}};
static BuiltinProto builtins[] = {{
More information about the Scummvm-git-logs
mailing list