[Scummvm-git-logs] scummvm master -> 9109b5ab9c3ea2464a0ba12f09ce2b0ece445ba7

[elasota]

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:
3dec097149 MTROPOLIS: Fix onLoad hooks not working
9109b5ab9c MTROPOLIS: Clean up uninitialized scaler


Commit: 3dec09714975267fab3c69213217db45dc5e8bad
    https://github.com/scummvm/scummvm/commit/3dec09714975267fab3c69213217db45dc5e8bad
Author: elasota (ejlasota at gmail.com)
Date: 2022-10-09T10:11:35-04:00

Commit Message:
MTROPOLIS: Fix onLoad hooks not working

Changed paths:
    engines/mtropolis/modifiers.cpp


diff --git a/engines/mtropolis/modifiers.cpp b/engines/mtropolis/modifiers.cpp
index 8824dc8844f..da0509da637 100644
--- a/engines/mtropolis/modifiers.cpp
+++ b/engines/mtropolis/modifiers.cpp
@@ -422,9 +422,9 @@ VThreadState SaveAndRestoreModifier::consumeMessage(Runtime *runtime, const Comm
 
 		bool succeeded = false;
 		if (isPrompt)
-			runtime->getLoadProvider()->promptLoad(&loader);
+			succeeded = runtime->getLoadProvider()->promptLoad(&loader);
 		else
-			runtime->getLoadProvider()->namedLoad(&loader, _fileName);
+			succeeded = runtime->getLoadProvider()->namedLoad(&loader, _fileName);
 
 		if (succeeded) {
 			for (const Common::SharedPtr<SaveLoadHooks> &hooks : runtime->getHacks().saveLoadHooks)


Commit: 9109b5ab9c3ea2464a0ba12f09ce2b0ece445ba7
    https://github.com/scummvm/scummvm/commit/9109b5ab9c3ea2464a0ba12f09ce2b0ece445ba7
Author: elasota (ejlasota at gmail.com)
Date: 2022-10-09T10:11:36-04:00

Commit Message:
MTROPOLIS: Clean up uninitialized scaler

Changed paths:
    engines/mtropolis/modifiers.cpp
    engines/mtropolis/modifiers.h


diff --git a/engines/mtropolis/modifiers.cpp b/engines/mtropolis/modifiers.cpp
index da0509da637..225af0db80b 100644
--- a/engines/mtropolis/modifiers.cpp
+++ b/engines/mtropolis/modifiers.cpp
@@ -68,6 +68,9 @@ bool CompoundVarLoader::readSave(Common::ReadStream *stream, uint32 saveFileVers
 	return true;
 }
 
+BehaviorModifier::BehaviorModifier() : _switchable(false), _isEnabled(false) {
+}
+
 bool BehaviorModifier::load(ModifierLoaderContext &context, const Data::BehaviorModifier &data) {
 	if (data.numChildren > 0) {
 		ChildLoaderContext loaderContext;
@@ -500,6 +503,9 @@ const char *SetModifier::getDefaultName() const {
 	return "Set Modifier";
 }
 
+AliasModifier::AliasModifier() : _aliasID(0) {
+}
+
 bool AliasModifier::load(ModifierLoaderContext &context, const Data::AliasModifier &data) {
 	_guid = data.guid;
 	if (!_modifierFlags.load(data.modifierFlags))
@@ -672,6 +678,9 @@ const char *ChangeSceneModifier::getDefaultName() const {
 	return "Change Scene Modifier";
 }
 
+SoundEffectModifier::SoundEffectModifier() : _soundType(kSoundTypeBeep), _assetID(0) {
+}
+
 bool SoundEffectModifier::load(ModifierLoaderContext &context, const Data::SoundEffectModifier &data) {
 	if (!loadTypicalHeader(data.modHeader))
 		return false;
@@ -1425,6 +1434,9 @@ VThreadState IfMessengerModifier::evaluateAndSendTask(const EvaluateAndSendTaskD
 	return kVThreadReturn;
 }
 
+TimerMessengerModifier::TimerMessengerModifier() : _milliseconds(0), _looping(false) {
+}
+
 TimerMessengerModifier::~TimerMessengerModifier() {
 	if (_scheduledEvent)
 		_scheduledEvent->cancel();
@@ -2311,6 +2323,9 @@ const char *CompoundVariableModifier::getDefaultName() const {
 	return "Compound Variable";
 }
 
+BooleanVariableModifier::BooleanVariableModifier() : _value(false) {
+}
+
 bool BooleanVariableModifier::load(ModifierLoaderContext &context, const Data::BooleanVariableModifier &data) {
 	if (!loadTypicalHeader(data.modHeader))
 		return false;
@@ -2383,6 +2398,9 @@ bool BooleanVariableModifier::SaveLoad::loadInternal(Common::ReadStream *stream,
 	return true;
 }
 
+IntegerVariableModifier::IntegerVariableModifier() : _value(0) {
+}
+
 bool IntegerVariableModifier::load(ModifierLoaderContext& context, const Data::IntegerVariableModifier& data) {
 	if (!loadTypicalHeader(data.modHeader))
 		return false;
@@ -2726,6 +2744,9 @@ bool PointVariableModifier::SaveLoad::loadInternal(Common::ReadStream *stream, u
 	return true;
 }
 
+FloatingPointVariableModifier::FloatingPointVariableModifier() : _value(0.0) {
+}
+
 bool FloatingPointVariableModifier::load(ModifierLoaderContext &context, const Data::FloatingPointVariableModifier &data) {
 	if (!loadTypicalHeader(data.modHeader))
 		return false;
diff --git a/engines/mtropolis/modifiers.h b/engines/mtropolis/modifiers.h
index b30ec28646b..ea88255ea07 100644
--- a/engines/mtropolis/modifiers.h
+++ b/engines/mtropolis/modifiers.h
@@ -40,6 +40,8 @@ class MiniscriptThread;
 
 class BehaviorModifier : public Modifier, public IModifierContainer {
 public:
+	BehaviorModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::BehaviorModifier &data);
 
 	bool isBehavior() const override { return true; }
@@ -250,6 +252,8 @@ private:
 
 class AliasModifier : public Modifier {
 public:
+	AliasModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::AliasModifier &data);
 	uint32 getAliasID() const;
 
@@ -305,6 +309,8 @@ private:
 
 class SoundEffectModifier : public Modifier {
 public:
+	SoundEffectModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::SoundEffectModifier &data);
 
 	bool respondsToEvent(const Event &evt) const override;
@@ -582,6 +588,7 @@ private:
 
 class TimerMessengerModifier : public Modifier {
 public:
+	TimerMessengerModifier();
 	~TimerMessengerModifier();
 
 	bool load(ModifierLoaderContext &context, const Data::TimerMessengerModifier &data);
@@ -926,6 +933,8 @@ private:
 
 class BooleanVariableModifier : public VariableModifier {
 public:
+	BooleanVariableModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::BooleanVariableModifier &data);
 
 	Common::SharedPtr<ModifierSaveLoad> getSaveLoad() override;
@@ -961,6 +970,8 @@ private:
 
 class IntegerVariableModifier : public VariableModifier {
 public:
+	IntegerVariableModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::IntegerVariableModifier &data);
 
 	Common::SharedPtr<ModifierSaveLoad> getSaveLoad() override;
@@ -1110,6 +1121,8 @@ private:
 
 class FloatingPointVariableModifier : public VariableModifier {
 public:
+	FloatingPointVariableModifier();
+
 	bool load(ModifierLoaderContext &context, const Data::FloatingPointVariableModifier &data);
 
 	Common::SharedPtr<ModifierSaveLoad> getSaveLoad() override;