[Scummvm-git-logs] scummvm master -> 33982d1a6f52026203ef8907559c13aca4090165
elasota
noreply at scummvm.org
Sun Sep 15 08:05:58 UTC 2024
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:
33982d1a6f MTROPOLIS: add stubs for OpenTitle and Navigate modifiers
Commit: 33982d1a6f52026203ef8907559c13aca4090165
https://github.com/scummvm/scummvm/commit/33982d1a6f52026203ef8907559c13aca4090165
Author: Michael (michael_kuerbis at web.de)
Date: 2024-09-15T04:05:54-04:00
Commit Message:
MTROPOLIS: add stubs for OpenTitle and Navigate modifiers
Changed paths:
engines/mtropolis/plugin/standard.cpp
engines/mtropolis/plugin/standard.h
engines/mtropolis/plugin/standard_data.cpp
engines/mtropolis/plugin/standard_data.h
diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index ecc73876602..303fb45c623 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -1718,6 +1718,91 @@ const char *PrintModifier::getDefaultName() const {
return "Print Modifier";
}
+NavigateModifier::NavigateModifier() {
+}
+
+NavigateModifier::~NavigateModifier() {
+}
+
+bool NavigateModifier::load(const PlugInModifierLoaderContext &context, const Data::Standard::NavigateModifier &data) {
+ return true;
+}
+
+bool NavigateModifier::respondsToEvent(const Event &evt) const {
+ return false;
+}
+
+VThreadState NavigateModifier::consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) {
+ return kVThreadReturn;
+}
+
+void NavigateModifier::disable(Runtime *runtime) {
+}
+
+#ifdef MTROPOLIS_DEBUG_ENABLE
+void NavigateModifier::debugInspect(IDebugInspectionReport *report) const {
+ Modifier::debugInspect(report);
+}
+#endif
+
+Common::SharedPtr<Modifier> NavigateModifier::shallowClone() const {
+ return Common::SharedPtr<Modifier>(new NavigateModifier(*this));
+}
+
+const char *NavigateModifier::getDefaultName() const {
+ return "Navigate Modifier"; // ???
+}
+
+OpenTitleModifier::OpenTitleModifier()
+ : _addToReturnList(false){
+}
+
+OpenTitleModifier::~OpenTitleModifier() {
+}
+
+bool OpenTitleModifier::load(const PlugInModifierLoaderContext &context, const Data::Standard::OpenTitleModifier &data) {
+ if (data.executeWhen.type != Data::PlugInTypeTaggedValue::kEvent || data.pathOrUrl.type != Data::PlugInTypeTaggedValue::kString || data.addToReturnList.type != Data::PlugInTypeTaggedValue::kInteger)
+ return false;
+
+ if (!_executeWhen.load(data.executeWhen.value.asEvent))
+ return false;
+
+ _pathOrUrl = data.pathOrUrl.value.asString;
+
+ _addToReturnList = static_cast<bool>(data.addToReturnList.value.asInt);
+
+ return true;
+}
+
+bool OpenTitleModifier::respondsToEvent(const Event &evt) const {
+ return _executeWhen.respondsTo(evt);
+}
+
+VThreadState OpenTitleModifier::consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) {
+#ifdef MTROPOLIS_DEBUG_ENABLE
+ if (Debugger *debugger = runtime->debugGetDebugger())
+ debugger->notify(kDebugSeverityWarning, "Open Title modifier was executed, which isn't implemented yet");
+#endif
+ return kVThreadReturn;
+}
+
+void OpenTitleModifier::disable(Runtime *runtime) {
+}
+
+#ifdef MTROPOLIS_DEBUG_ENABLE
+void OpenTitleModifier::debugInspect(IDebugInspectionReport *report) const {
+ Modifier::debugInspect(report);
+}
+#endif
+
+Common::SharedPtr<Modifier> OpenTitleModifier::shallowClone() const {
+ return Common::SharedPtr<Modifier>(new OpenTitleModifier(*this));
+}
+
+const char *OpenTitleModifier::getDefaultName() const {
+ return "Open Title Modifier"; // ???
+}
+
StandardPlugInHacks::StandardPlugInHacks() : allowGarbledListModData(false) {
}
@@ -1730,7 +1815,9 @@ StandardPlugIn::StandardPlugIn()
, _sysInfoModifierFactory(this)
, _panningModifierFactory(this)
, _fadeModifierFactory(this)
- , _printModifierFactory(this) {
+ , _printModifierFactory(this)
+ , _navigateModifierFactory(this)
+ , _openTitleModifierFactory(this) {
}
StandardPlugIn::~StandardPlugIn() {
@@ -1747,6 +1834,8 @@ void StandardPlugIn::registerModifiers(IPlugInModifierRegistrar *registrar) cons
registrar->registerPlugInModifier("panning", &_panningModifierFactory);
registrar->registerPlugInModifier("fade", &_fadeModifierFactory);
+ registrar->registerPlugInModifier("Navigate", &_navigateModifierFactory);
+ registrar->registerPlugInModifier("OpenTitle", &_openTitleModifierFactory);
}
const StandardPlugInHacks &StandardPlugIn::getHacks() const {
diff --git a/engines/mtropolis/plugin/standard.h b/engines/mtropolis/plugin/standard.h
index 6dce8c9151c..61945ce8fb9 100644
--- a/engines/mtropolis/plugin/standard.h
+++ b/engines/mtropolis/plugin/standard.h
@@ -394,6 +394,54 @@ private:
Common::String _filePath;
};
+class NavigateModifier : public Modifier {
+public:
+ NavigateModifier();
+ ~NavigateModifier();
+
+ bool load(const PlugInModifierLoaderContext &context, const Data::Standard::NavigateModifier &data);
+
+ bool respondsToEvent(const Event &evt) const override;
+ VThreadState consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
+
+ void disable(Runtime *runtime) override;
+
+#ifdef MTROPOLIS_DEBUG_ENABLE
+ const char *debugGetTypeName() const override { return "Navigate Modifier"; }
+ void debugInspect(IDebugInspectionReport *report) const override;
+#endif
+
+private:
+ Common::SharedPtr<Modifier> shallowClone() const override;
+ const char *getDefaultName() const override;
+};
+
+class OpenTitleModifier : public Modifier {
+public:
+ OpenTitleModifier();
+ ~OpenTitleModifier();
+
+ bool load(const PlugInModifierLoaderContext &context, const Data::Standard::OpenTitleModifier &data);
+
+ bool respondsToEvent(const Event &evt) const override;
+ VThreadState consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
+
+ void disable(Runtime *runtime) override;
+
+#ifdef MTROPOLIS_DEBUG_ENABLE
+ const char *debugGetTypeName() const override { return "Open Title Modifier"; }
+ void debugInspect(IDebugInspectionReport *report) const override;
+#endif
+
+private:
+ Common::SharedPtr<Modifier> shallowClone() const override;
+ const char *getDefaultName() const override;
+
+ Event _executeWhen;
+ Common::String _pathOrUrl;
+ bool _addToReturnList;
+};
+
class StandardPlugIn : public MTropolis::PlugIn {
public:
StandardPlugIn();
@@ -414,6 +462,8 @@ private:
PlugInModifierFactory<PanningModifier, Data::Standard::PanningModifier> _panningModifierFactory;
PlugInModifierFactory<FadeModifier, Data::Standard::FadeModifier> _fadeModifierFactory;
PlugInModifierFactory<PrintModifier, Data::Standard::PrintModifier> _printModifierFactory;
+ PlugInModifierFactory<NavigateModifier, Data::Standard::NavigateModifier> _navigateModifierFactory;
+ PlugInModifierFactory<OpenTitleModifier, Data::Standard::OpenTitleModifier> _openTitleModifierFactory;
StandardPlugInHacks _hacks;
};
diff --git a/engines/mtropolis/plugin/standard_data.cpp b/engines/mtropolis/plugin/standard_data.cpp
index bee23863662..80b9424a414 100644
--- a/engines/mtropolis/plugin/standard_data.cpp
+++ b/engines/mtropolis/plugin/standard_data.cpp
@@ -209,6 +209,25 @@ DataReadErrorCode PrintModifier::load(PlugIn &plugIn, const PlugInModifier &pref
return kDataReadErrorNone;
}
+DataReadErrorCode NavigateModifier::load(PlugIn &plugIn, const PlugInModifier &prefix, DataReader &reader) {
+ if (prefix.plugInRevision != 0)
+ return kDataReadErrorUnsupportedRevision;
+
+ error("Data structure loading for the Navigate modifier is not implemented.");
+
+ return kDataReadErrorNone;
+}
+
+DataReadErrorCode OpenTitleModifier::load(PlugIn &plugIn, const PlugInModifier &prefix, DataReader &reader) {
+ if (prefix.plugInRevision != 0)
+ return kDataReadErrorUnsupportedRevision;
+
+ if (!executeWhen.load(reader) || !pathOrUrl.load(reader) || !addToReturnList.load(reader))
+ return kDataReadErrorReadFailed;
+
+ return kDataReadErrorNone;
+}
+
} // End of namespace Standard
} // End of namespace Data
diff --git a/engines/mtropolis/plugin/standard_data.h b/engines/mtropolis/plugin/standard_data.h
index ab5e4b4966b..fa87e3cc2dd 100644
--- a/engines/mtropolis/plugin/standard_data.h
+++ b/engines/mtropolis/plugin/standard_data.h
@@ -164,6 +164,20 @@ protected:
DataReadErrorCode load(PlugIn &plugIn, const PlugInModifier &prefix, DataReader &reader) override;
};
+struct NavigateModifier : public PlugInModifierData {
+protected:
+ DataReadErrorCode load(PlugIn &plugIn, const PlugInModifier &prefix, DataReader &reader) override;
+};
+
+struct OpenTitleModifier : public PlugInModifierData {
+ PlugInTypeTaggedValue executeWhen;
+ PlugInTypeTaggedValue pathOrUrl;
+ PlugInTypeTaggedValue addToReturnList;
+
+protected:
+ DataReadErrorCode load(PlugIn &plugIn, const PlugInModifier &prefix, DataReader &reader) override;
+};
+
} // End of namespace Standard
} // End of namespace Data
More information about the Scummvm-git-logs
mailing list