[Scummvm-git-logs] scummvm master -> 57a9a801a62b6c26dd3fb5c05e415e5bcdfa300c
sev-
noreply at scummvm.org
Mon Feb 6 09:00:26 UTC 2023
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7e6c8964b8 DIRECTOR: LINGO: Added BatQT XObject stub
57a9a801a6 DIRECTOR: LINGO: Added BlitPict XObject stub
Commit: 7e6c8964b85d0acd369644368e505efde0403346
https://github.com/scummvm/scummvm/commit/7e6c8964b85d0acd369644368e505efde0403346
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-06T09:55:25+01:00
Commit Message:
DIRECTOR: LINGO: Added BatQT XObject stub
Changed paths:
A engines/director/lingo/xlibs/batqt.cpp
A engines/director/lingo/xlibs/batqt.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 155fdd0c137..8d867ffa4ea 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -40,6 +40,7 @@
#include "director/lingo/xlibs/applecdxobj.h"
#include "director/lingo/xlibs/askuser.h"
#include "director/lingo/xlibs/barakeobj.h"
+#include "director/lingo/xlibs/batqt.h"
#include "director/lingo/xlibs/cdromxobj.h"
#include "director/lingo/xlibs/darkenscreen.h"
#include "director/lingo/xlibs/developerStack.h"
@@ -150,6 +151,7 @@ static struct XLibProto {
{ AppleCDXObj::fileNames, AppleCDXObj::open, AppleCDXObj::close, kXObj, 400 }, // D4
{ AskUser::fileNames, AskUser::open, AskUser::close, kXObj, 400 }, // D4
{ BarakeObj::fileNames, BarakeObj::open, BarakeObj::close, kXObj, 400 }, // D4
+ { BatQT::fileNames, BatQT::open, BatQT::close, kXObj, 400 }, // D4
{ CDROMXObj::fileNames, CDROMXObj::open, CDROMXObj::close, kXObj, 200 }, // D2
{ DarkenScreen::fileNames, DarkenScreen::open, DarkenScreen::close, kXObj, 300 }, // D3
{ DeveloperStack::fileNames, DeveloperStack::open, DeveloperStack::close, kXObj, 300 }, // D3
diff --git a/engines/director/lingo/xlibs/batqt.cpp b/engines/director/lingo/xlibs/batqt.cpp
new file mode 100644
index 00000000000..68003375aa6
--- /dev/null
+++ b/engines/director/lingo/xlibs/batqt.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/>.
+ *
+ */
+
+/**
+ * -- BatQt quicktime factory. 9Aug94 RNB
+ * BatQt
+ * I mNew --Creates a new instance of the XObject
+ * X mDispose --Disposes of XObject instance
+ * S mName --Returns the XObject name
+ * I mStatus --Returns an integer status code
+ * SI mError, code --Returns an error string
+ * S mLastError --Returns last error string
+ * ISI mOpen --Opens the specified movie
+ * IIIS mPlay --Play the movie, after setting parms
+ * I mStop --Stop the movie
+ * S mGetTimeRange --Gets the current time range
+ * S mGetMovieBox --Gets the current bounds box of the movie
+ * I mGetTime --Gets the current time of the movie
+ * SI mSetTime --Sets the current time of the movie
+ * SI mSetVolume --Sets the volume of the movie
+ * I mLength --Gets the length of the movie
+ * IIIII mSetMovieBox --Sets the bounding box of the movie
+ * III mSetTimeRange -- Sets the active segment of the movie
+ * II mAddCallback -- Adds a callback for the movie
+ * II mRemoveCallback -- Removes a callback for the movie
+ * I mResetCallbacks -- Resets the sent status of the callbacks
+ * XS mSetBatch -- Applies a set of batch commands
+ *
+ * USED IN: teamxtreme2-win
+ */
+
+#include "director/director.h"
+#include "director/lingo/lingo.h"
+#include "director/lingo/lingo-object.h"
+#include "director/lingo/xlibs/batqt.h"
+
+
+namespace Director {
+
+// The name is different from the obj filename.
+const char *BatQT::xlibName = "batQT";
+const char *BatQT::fileNames[] = {
+ "batQT",
+ nullptr
+};
+
+static MethodProto xlibMethods[] = {
+ { "new", BatQT::m_new, 0, 0, 400 }, // D4
+ { nullptr, nullptr, 0, 0, 0 }
+};
+
+void BatQT::open(int type) {
+ if (type == kXObj) {
+ BatQTXObject::initMethods(xlibMethods);
+ BatQTXObject *xobj = new BatQTXObject(kXObj);
+ g_lingo->exposeXObject(xlibName, xobj);
+ }
+}
+
+void BatQT::close(int type) {
+ if (type == kXObj) {
+ BatQTXObject::cleanupMethods();
+ g_lingo->_globalvars[xlibName] = Datum();
+ }
+}
+
+
+BatQTXObject::BatQTXObject(ObjectType ObjectType) : Object<BatQTXObject>("FindSys") {
+ _objType = ObjectType;
+}
+
+void BatQT::m_new(int nargs) {
+ g_lingo->push(g_lingo->_state->me);
+}
+
+} // End of namespace Director
diff --git a/engines/director/lingo/xlibs/batqt.h b/engines/director/lingo/xlibs/batqt.h
new file mode 100644
index 00000000000..fb75f5b4573
--- /dev/null
+++ b/engines/director/lingo/xlibs/batqt.h
@@ -0,0 +1,46 @@
+/* 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_BATQT_H
+#define DIRECTOR_LINGO_XLIBS_BATQT_H
+
+namespace Director {
+
+class BatQTXObject : public Object<BatQTXObject> {
+public:
+ BatQTXObject(ObjectType objType);
+};
+
+namespace BatQT {
+
+extern const char *xlibName;
+extern const char *fileNames[];
+
+void open(int type);
+void close(int type);
+
+void m_new(int nargs);
+
+} // End of namespace BatQT
+
+} // End of namespace Director
+
+#endif
diff --git a/engines/director/module.mk b/engines/director/module.mk
index f5b1e5db176..7c906719f26 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -43,6 +43,7 @@ MODULE_OBJS = \
lingo/xlibs/applecdxobj.o \
lingo/xlibs/askuser.o \
lingo/xlibs/barakeobj.o \
+ lingo/xlibs/batqt.o \
lingo/xlibs/cdromxobj.o \
lingo/xlibs/darkenscreen.o \
lingo/xlibs/developerStack.o \
Commit: 57a9a801a62b6c26dd3fb5c05e415e5bcdfa300c
https://github.com/scummvm/scummvm/commit/57a9a801a62b6c26dd3fb5c05e415e5bcdfa300c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-02-06T09:59:14+01:00
Commit Message:
DIRECTOR: LINGO: Added BlitPict XObject stub
Changed paths:
A engines/director/lingo/xlibs/blitpict.cpp
A engines/director/lingo/xlibs/blitpict.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 8d867ffa4ea..8bca3c3b754 100644
--- a/engines/director/lingo/lingo-object.cpp
+++ b/engines/director/lingo/lingo-object.cpp
@@ -41,6 +41,7 @@
#include "director/lingo/xlibs/askuser.h"
#include "director/lingo/xlibs/barakeobj.h"
#include "director/lingo/xlibs/batqt.h"
+#include "director/lingo/xlibs/blitpict.h"
#include "director/lingo/xlibs/cdromxobj.h"
#include "director/lingo/xlibs/darkenscreen.h"
#include "director/lingo/xlibs/developerStack.h"
@@ -152,6 +153,7 @@ static struct XLibProto {
{ AskUser::fileNames, AskUser::open, AskUser::close, kXObj, 400 }, // D4
{ BarakeObj::fileNames, BarakeObj::open, BarakeObj::close, kXObj, 400 }, // D4
{ BatQT::fileNames, BatQT::open, BatQT::close, kXObj, 400 }, // D4
+ { BlitPict::fileNames, BlitPict::open, BlitPict::close, kXObj, 400 }, // D4
{ CDROMXObj::fileNames, CDROMXObj::open, CDROMXObj::close, kXObj, 200 }, // D2
{ DarkenScreen::fileNames, DarkenScreen::open, DarkenScreen::close, kXObj, 300 }, // D3
{ DeveloperStack::fileNames, DeveloperStack::open, DeveloperStack::close, kXObj, 300 }, // D3
diff --git a/engines/director/lingo/xlibs/blitpict.cpp b/engines/director/lingo/xlibs/blitpict.cpp
new file mode 100644
index 00000000000..107dd25725c
--- /dev/null
+++ b/engines/director/lingo/xlibs/blitpict.cpp
@@ -0,0 +1,83 @@
+/* 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/>.
+ *
+ */
+
+/**
+ * -- BlitPict effects factory. 29Jun94 RNB
+ * BlitPict
+ * I mNew --Creates a new instance of the XObject
+ * X mDispose --Disposes of XObject instance
+ * S mName --Returns the XObject name (BlitPict)
+ * I mStatus --Returns an integer status code
+ * SI mError, code --Returns an error string
+ * S mLastError --Returns last error string
+ * SSIIIII mInit --Initializer
+ * SOIIII mCopy --Initializes from an existing object
+ * IIIIIOIIIIIIII mDraw --Draws to a destinitation
+ * IIIIIIIIIIII mSparkle --Draws a sparkle from a bitmap
+ *
+ * USED IN: teamxtreme2-win
+ */
+
+#include "director/director.h"
+#include "director/lingo/lingo.h"
+#include "director/lingo/lingo-object.h"
+#include "director/lingo/xlibs/blitpict.h"
+
+
+namespace Director {
+
+// The name is different from the obj filename.
+const char *BlitPict::xlibName = "BlitPict";
+const char *BlitPict::fileNames[] = {
+ "BlitPict",
+ nullptr
+};
+
+static MethodProto xlibMethods[] = {
+ { "new", BlitPict::m_new, 0, 0, 400 }, // D4
+ { nullptr, nullptr, 0, 0, 0 }
+};
+
+void BlitPict::open(int type) {
+ if (type == kXObj) {
+ BlitPictXObject::initMethods(xlibMethods);
+ BlitPictXObject *xobj = new BlitPictXObject(kXObj);
+ g_lingo->exposeXObject(xlibName, xobj);
+ }
+}
+
+void BlitPict::close(int type) {
+ if (type == kXObj) {
+ BlitPictXObject::cleanupMethods();
+ g_lingo->_globalvars[xlibName] = Datum();
+ }
+}
+
+
+BlitPictXObject::BlitPictXObject(ObjectType ObjectType) : Object<BlitPictXObject>("BlitPict") {
+ _objType = ObjectType;
+}
+
+void BlitPict::m_new(int nargs) {
+ g_lingo->push(g_lingo->_state->me);
+}
+
+} // End of namespace Director
diff --git a/engines/director/lingo/xlibs/blitpict.h b/engines/director/lingo/xlibs/blitpict.h
new file mode 100644
index 00000000000..11ab59c6c0a
--- /dev/null
+++ b/engines/director/lingo/xlibs/blitpict.h
@@ -0,0 +1,46 @@
+/* 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_BLITPICT_H
+#define DIRECTOR_LINGO_XLIBS_BLITPICT_H
+
+namespace Director {
+
+class BlitPictXObject : public Object<BlitPictXObject> {
+public:
+ BlitPictXObject(ObjectType objType);
+};
+
+namespace BlitPict {
+
+extern const char *xlibName;
+extern const char *fileNames[];
+
+void open(int type);
+void close(int type);
+
+void m_new(int nargs);
+
+} // End of namespace BlitPict
+
+} // End of namespace Director
+
+#endif
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 7c906719f26..3576a462ce0 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -44,6 +44,7 @@ MODULE_OBJS = \
lingo/xlibs/askuser.o \
lingo/xlibs/barakeobj.o \
lingo/xlibs/batqt.o \
+ lingo/xlibs/blitpict.o \
lingo/xlibs/cdromxobj.o \
lingo/xlibs/darkenscreen.o \
lingo/xlibs/developerStack.o \
More information about the Scummvm-git-logs
mailing list