[Scummvm-git-logs] scummvm master -> cf8f854960a2d0b710c82df9bce64b2db9709313
rvanlaar
noreply at scummvm.org
Mon Oct 17 10:50:13 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cf8f854960 DIRECTOR: LINGO: XOBJ: Scaffolding for Widget
Commit: cf8f854960a2d0b710c82df9bce64b2db9709313
https://github.com/scummvm/scummvm/commit/cf8f854960a2d0b710c82df9bce64b2db9709313
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2022-10-17T12:49:46+02:00
Commit Message:
DIRECTOR: LINGO: XOBJ: Scaffolding for Widget
Widget is an XObject used in Alice: An Interactive Museum.
The assumption is that getPro returns the drive letter as
the return value of getPro is assigned to a variable called drv.
Resolves the following errors from: https://bugs.scummvm.org/ticket/13204
- WARNING: BUILDBOT: Uncaught Lingo error: Call to undefined handler 'Widget'. Dropping 1 stack items!
- WARNING: varFetch: global variable drv not defined!
Changed paths:
A engines/director/lingo/xlibs/widgetxobj.cpp
A engines/director/lingo/xlibs/widgetxobj.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 4255a155b6c..1416d1f493e 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -59,6 +59,7 @@
#include "director/lingo/xlibs/serialportxobj.h"
#include "director/lingo/xlibs/soundjam.h"
#include "director/lingo/xlibs/videodiscxobj.h"
+#include "director/lingo/xlibs/widgetxobj.h"
#include "director/lingo/xlibs/winxobj.h"
#include "director/lingo/xlibs/xplayanim.h"
@@ -154,6 +155,7 @@ static struct XLibProto {
{ RegisterComponent::fileNames, RegisterComponent::open, RegisterComponent::close, kXObj, 400 }, // D4
{ SerialPortXObj::fileNames, SerialPortXObj::open, SerialPortXObj::close, kXObj, 200 }, // D2
{ SoundJam::fileNames, SoundJam::open, SoundJam::close, kXObj, 400 }, // D4
+ { WidgetXObj::fileNames, WidgetXObj::open, WidgetXObj::close, kXObj, 400 }, // D4
{ VideodiscXObj::fileNames, VideodiscXObj::open, VideodiscXObj::close, kXObj, 200 }, // D2
{ XPlayAnim::fileNames, XPlayAnim::open, XPlayAnim::close, kXObj, 300 }, // D3
{ nullptr, nullptr, nullptr, 0, 0 }
diff --git a/engines/director/lingo/xlibs/widgetxobj.cpp b/engines/director/lingo/xlibs/widgetxobj.cpp
new file mode 100644
index 00000000000..343e5280470
--- /dev/null
+++ b/engines/director/lingo/xlibs/widgetxobj.cpp
@@ -0,0 +1,94 @@
+/* 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/>.
+ *
+ */
+
+/*
+ * Widget External Factory
+ * Used in: "Alice: An Interactive Museum"
+ *
+ * Widget
+ * I mNew --Creates a new instance of the XObject
+ * X mDispose --Disposes of XObject instance
+ * S mGetPro --
+ * I mAskQuit --
+ *
+ */
+
+#include "director/director.h"
+#include "director/lingo/lingo.h"
+#include "director/lingo/lingo-object.h"
+#include "director/lingo/xlibs/widgetxobj.h"
+
+namespace Director {
+
+
+const char *WidgetXObj::xlibName = "widget";
+const char *WidgetXObj::fileNames[] = {
+ "widget",
+ nullptr
+};
+
+static MethodProto xlibMethods[] = {
+ { "new", WidgetXObj::m_new, 0, 0, 400 }, // D4
+ { "Dispose", WidgetXObj::m_dispose, 0, 0, 400 }, // D4
+ { "GetPro", WidgetXObj::m_getPro, 0, 0, 400 }, // D4
+ { "AskQuit", WidgetXObj::m_askQuit, 0, 0, 400 }, // D4
+ { nullptr, nullptr, 0, 0, 0 }
+};
+
+void WidgetXObj::open(int type) {
+ if (type == kXObj) {
+ WidgetXObject::initMethods(xlibMethods);
+ WidgetXObject *xobj = new WidgetXObject(kXObj);
+ g_lingo->exposeXObject(xlibName, xobj);
+ }
+}
+
+void WidgetXObj::close(int type) {
+ if (type == kXObj) {
+ WidgetXObject::cleanupMethods();
+ g_lingo->_globalvars[xlibName] = Datum();
+ }
+}
+
+WidgetXObject::WidgetXObject(ObjectType ObjectType) :Object<WidgetXObject>("WidgetXObj") {
+ _objType = ObjectType;
+}
+
+void WidgetXObj::m_new(int nargs) {
+ g_lingo->push(g_lingo->_currentMe);
+}
+
+void WidgetXObj::m_dispose(int nargs) {
+ g_lingo->printSTUBWithArglist("WidgetXObj::m_dispose", nargs);
+ g_lingo->dropStack(nargs);
+}
+
+void WidgetXObj::m_getPro(int nargs) {
+ // seems to want a disk drive letter
+ g_lingo->push(Datum("D"));
+}
+
+void WidgetXObj::m_askQuit(int nargs) {
+ g_lingo->printSTUBWithArglist("WidgetXObj::m_askQuit", nargs);
+ g_lingo->dropStack(nargs);
+}
+
+}
diff --git a/engines/director/lingo/xlibs/widgetxobj.h b/engines/director/lingo/xlibs/widgetxobj.h
new file mode 100644
index 00000000000..88d43e53b04
--- /dev/null
+++ b/engines/director/lingo/xlibs/widgetxobj.h
@@ -0,0 +1,49 @@
+/* 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_WIDGETXOBJ_H
+#define DIRECTOR_LINGO_XLIBS_WIDGETXOBJ_H
+
+namespace Director {
+
+class WidgetXObject : public Object<WidgetXObject> {
+public:
+ WidgetXObject(ObjectType objType);
+};
+
+namespace WidgetXObj {
+
+extern const char *xlibName;
+extern const char *fileNames[];
+
+void open(int type);
+void close(int type);
+
+void m_new(int nargs);
+void m_dispose(int nargs);
+void m_getPro(int nargs);
+void m_askQuit(int nargs);
+
+} // End of namespace WidgetXObj
+
+} // End of namespace Director
+
+#endif
\ No newline at end of file
diff --git a/engines/director/module.mk b/engines/director/module.mk
index ac3b82d902b..b453005bb6f 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -62,6 +62,7 @@ MODULE_OBJS = \
lingo/xlibs/serialportxobj.o \
lingo/xlibs/soundjam.o \
lingo/xlibs/videodiscxobj.o \
+ lingo/xlibs/widgetxobj.o \
lingo/xlibs/winxobj.o \
lingo/xlibs/xplayanim.o
More information about the Scummvm-git-logs
mailing list