[Scummvm-git-logs] scummvm master -> 8cf16488e60827ed5c7aa7e570b6722355ddeb2f
sev-
noreply at scummvm.org
Wed Jul 13 21:38:24 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:
8cf16488e6 MTROPOLIS: Fix warnings
Commit: 8cf16488e60827ed5c7aa7e570b6722355ddeb2f
https://github.com/scummvm/scummvm/commit/8cf16488e60827ed5c7aa7e570b6722355ddeb2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-13T23:37:39+02:00
Commit Message:
MTROPOLIS: Fix warnings
Changed paths:
engines/mtropolis/debug.h
engines/mtropolis/elements.h
engines/mtropolis/modifiers.h
engines/mtropolis/plugin/obsidian.h
engines/mtropolis/plugin/standard.h
engines/mtropolis/runtime.h
diff --git a/engines/mtropolis/debug.h b/engines/mtropolis/debug.h
index 96d3920ded5..0c6942f3d83 100644
--- a/engines/mtropolis/debug.h
+++ b/engines/mtropolis/debug.h
@@ -131,7 +131,7 @@ class Notification {
public:
private:
- Runtime *_runtime;
+ //Runtime *_runtime;
};
enum DebuggerTool {
diff --git a/engines/mtropolis/elements.h b/engines/mtropolis/elements.h
index ce8664e05d1..bbd3a59d54b 100644
--- a/engines/mtropolis/elements.h
+++ b/engines/mtropolis/elements.h
@@ -161,8 +161,8 @@ public:
bool load(ElementLoaderContext &context, const Data::ImageElement &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib) override;
void activate() override;
void deactivate() override;
@@ -235,7 +235,7 @@ private:
MiniscriptInstructionOutcome scriptRangeWriteRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
MiniscriptInstructionOutcome scriptSetRangeTyped(MiniscriptThread *thread, const IntRange &value);
- void onPauseStateChanged();
+ void onPauseStateChanged() override;
bool _cacheBitmap;
@@ -270,9 +270,9 @@ public:
bool load(ElementLoaderContext &context, const Data::TextLabelElement &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
bool readAttributeIndexed(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib, const DynamicValue &index) override;
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib);
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib) override;
MiniscriptInstructionOutcome writeRefAttributeIndexed(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib, const DynamicValue &index) override;
void activate() override;
@@ -336,7 +336,7 @@ public:
bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &writeProxy, const Common::String &attrib) override;
- VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg);
+ VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
void activate() override;
void deactivate() override;
diff --git a/engines/mtropolis/modifiers.h b/engines/mtropolis/modifiers.h
index 600f51e57da..45a8f4a552b 100644
--- a/engines/mtropolis/modifiers.h
+++ b/engines/mtropolis/modifiers.h
@@ -140,8 +140,8 @@ public:
bool respondsToEvent(const Event &evt) const override;
VThreadState consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
- void linkInternalReferences(ObjectLinkingScope *outerScope);
- void visitInternalReferences(IStructuralReferenceVisitor *visitor);
+ void linkInternalReferences(ObjectLinkingScope *outerScope) override;
+ void visitInternalReferences(IStructuralReferenceVisitor *visitor) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Messenger Modifier"; }
@@ -449,8 +449,8 @@ public:
bool respondsToEvent(const Event &evt) const override;
VThreadState consumeMessage(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
- void linkInternalReferences(ObjectLinkingScope *outerScope);
- void visitInternalReferences(IStructuralReferenceVisitor *visitor);
+ void linkInternalReferences(ObjectLinkingScope *outerScope) override;
+ void visitInternalReferences(IStructuralReferenceVisitor *visitor) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Timer Messenger Modifier"; }
@@ -521,7 +521,7 @@ public:
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Collision Detection Messenger Modifier"; }
- SupportStatus debugGetSupportStatus() const { return kSupportStatusPartial; }
+ SupportStatus debugGetSupportStatus() const override { return kSupportStatusPartial; }
#endif
private:
@@ -559,7 +559,7 @@ public:
KeyboardMessengerModifier();
~KeyboardMessengerModifier();
- bool isKeyboardMessenger() const;
+ bool isKeyboardMessenger() const override;
bool load(ModifierLoaderContext &context, const Data::KeyboardMessengerModifier &data);
@@ -800,8 +800,8 @@ public:
bool varSetValue(MiniscriptThread *thread, const DynamicValue &value) override;
void varGetValue(MiniscriptThread *thread, DynamicValue &dest) const override;
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Integer Range Variable Modifier"; }
@@ -838,8 +838,8 @@ public:
bool varSetValue(MiniscriptThread *thread, const DynamicValue &value) override;
void varGetValue(MiniscriptThread *thread, DynamicValue &dest) const override;
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Vector Variable Modifier"; }
diff --git a/engines/mtropolis/plugin/obsidian.h b/engines/mtropolis/plugin/obsidian.h
index 5b84e402680..a74982e9ddb 100644
--- a/engines/mtropolis/plugin/obsidian.h
+++ b/engines/mtropolis/plugin/obsidian.h
@@ -58,7 +58,7 @@ class RectShiftModifier : public Modifier {
public:
bool load(const PlugInModifierLoaderContext &context, const Data::Obsidian::RectShiftModifier &data);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Rect Shift Modifier"; }
@@ -78,8 +78,8 @@ public:
bool load(const PlugInModifierLoaderContext &context, const Data::Obsidian::TextWorkModifier &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "TextWork Modifier"; }
@@ -106,8 +106,8 @@ public:
bool load(const PlugInModifierLoaderContext &context, const Data::Obsidian::DictionaryModifier &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Dictionary Modifier"; }
@@ -134,8 +134,8 @@ public:
bool load(const PlugInModifierLoaderContext &context, const Data::Obsidian::WordMixerModifier &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "WordMixer Modifier"; }
@@ -185,8 +185,8 @@ public:
bool load(const PlugInModifierLoaderContext &context, const Data::Obsidian::XorCheckModifier &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Xor Check Modifier"; }
diff --git a/engines/mtropolis/plugin/standard.h b/engines/mtropolis/plugin/standard.h
index f5033c6bc12..989541b4a3d 100644
--- a/engines/mtropolis/plugin/standard.h
+++ b/engines/mtropolis/plugin/standard.h
@@ -73,8 +73,8 @@ public:
bool load(const PlugInModifierLoaderContext &context, const Data::Standard::STransCtModifier &data);
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "STransCt Scene Transition Modifier"; }
@@ -152,8 +152,8 @@ public:
Common::SharedPtr<ModifierSaveLoad> getSaveLoad() override;
- bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib);
- MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib);
+ bool readAttribute(MiniscriptThread *thread, DynamicValue &result, const Common::String &attrib) override;
+ MiniscriptInstructionOutcome writeRefAttribute(MiniscriptThread *thread, DynamicValueWriteProxy &result, const Common::String &attrib) override;
bool varSetValue(MiniscriptThread *thread, const DynamicValue &value) override;
void varGetValue(MiniscriptThread *thread, DynamicValue &dest) const override;
diff --git a/engines/mtropolis/runtime.h b/engines/mtropolis/runtime.h
index 09a5afd473e..18437134f27 100644
--- a/engines/mtropolis/runtime.h
+++ b/engines/mtropolis/runtime.h
@@ -1343,7 +1343,7 @@ public:
bool isTerminated() const;
VThreadState continuePropagating(Runtime *runtime);
-
+
private:
Common::Array<Common::WeakPtr<RuntimeObject> > _keyboardMessengers;
size_t _dispatchIndex;
@@ -1787,7 +1787,7 @@ struct IModifierContainer : public IInterfaceBase {
class SimpleModifierContainer : public IModifierContainer {
public:
- const Common::Array<Common::SharedPtr<Modifier> > &getModifiers() const;
+ const Common::Array<Common::SharedPtr<Modifier> > &getModifiers() const override;
void appendModifier(const Common::SharedPtr<Modifier> &modifier) override;
private:
@@ -2134,7 +2134,7 @@ public:
explicit Project(Runtime *runtime);
~Project();
- VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg);
+ VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
void loadFromDescription(const ProjectDescription &desc, const Hacks &hacks);
void loadSceneFromStream(const Common::SharedPtr<Structural> &structural, uint32 streamID, const Hacks &hacks);
@@ -2272,7 +2272,7 @@ class Section : public Structural {
public:
bool load(const Data::SectionStructuralDef &data);
- bool isSection() const;
+ bool isSection() const override;
#ifdef MTROPOLIS_DEBUG_ENABLE
const char *debugGetTypeName() const override { return "Section"; }
@@ -2426,7 +2426,7 @@ public:
bool isVisual() const override;
virtual bool isTextLabel() const;
- VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg);
+ VThreadState consumeCommand(Runtime *runtime, const Common::SharedPtr<MessageProperties> &msg) override;
bool isVisible() const;
void setVisible(bool visible);
@@ -2519,7 +2519,7 @@ protected:
Common::SharedPtr<DragMotionProperties> _dragProps;
- // Quirk: When a graphic modifier is applied, it needs to be
+ // Quirk: When a graphic modifier is applied, it needs to be
VisualElementRenderProperties _renderProps;
Common::WeakPtr<GraphicModifier> _primaryGraphicModifier;
@@ -2643,7 +2643,7 @@ protected:
class VariableModifier : public Modifier {
public:
- virtual bool isVariable() const;
+ virtual bool isVariable() const override;
virtual bool varSetValue(MiniscriptThread *thread, const DynamicValue &value) = 0;
virtual void varGetValue(MiniscriptThread *thread, DynamicValue &dest) const = 0;
virtual Common::SharedPtr<ModifierSaveLoad> getSaveLoad() override = 0;
More information about the Scummvm-git-logs
mailing list