[Scummvm-git-logs] scummvm master -> f5db27d95107b7ee0df2e59c9475be427f6d01d8

[elasota]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
17392f8350 MTROPOLIS: Stub out currentram attribute of SysInfo, report 256MB
85fb76a17f MTROPOLIS: Change support status of shared scene and sound effect modifiers to Done
f5db27d951 MTROPOLIS: Fix incorrect "opint" flags.  Fix returns not moving ATD scenes from the scene stack.


Commit: 17392f83504296481054b5f03b4fdac182b56344
    https://github.com/scummvm/scummvm/commit/17392f83504296481054b5f03b4fdac182b56344
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-26T22:57:13-04:00

Commit Message:
MTROPOLIS: Stub out currentram attribute of SysInfo, report 256MB

Changed paths:
    engines/mtropolis/plugin/standard.cpp


diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index c089f25b88d..9521e25b661 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -3281,6 +3281,9 @@ bool SysInfoModifier::readAttribute(MiniscriptThread *thread, DynamicValue &resu
 
 		result.setPoint(Common::Point(width, height));
 		return true;
+	} else if (attrib == "currentram") {
+		result.setInt(256 * 1024 * 1024);
+		return true;
 	}
 
 	return false;


Commit: 85fb76a17f2af08eeb49f027ba6bdea72cf6a1f8
    https://github.com/scummvm/scummvm/commit/85fb76a17f2af08eeb49f027ba6bdea72cf6a1f8
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-26T22:57:13-04:00

Commit Message:
MTROPOLIS: Change support status of shared scene and sound effect modifiers to Done

Changed paths:
    engines/mtropolis/modifiers.h


diff --git a/engines/mtropolis/modifiers.h b/engines/mtropolis/modifiers.h
index 56dd9e82474..7742d4ddfae 100644
--- a/engines/mtropolis/modifiers.h
+++ b/engines/mtropolis/modifiers.h
@@ -327,6 +327,7 @@ public:
 
 #ifdef MTROPOLIS_DEBUG_ENABLE
 	const char *debugGetTypeName() const override { return "Sound Effect Modifier"; }
+	SupportStatus debugGetSupportStatus() const override { return kSupportStatusDone; }
 #endif
 
 private:
@@ -673,7 +674,7 @@ public:
 
 #ifdef MTROPOLIS_DEBUG_ENABLE
 	const char *debugGetTypeName() const override { return "Shared Scene Modifier"; }
-	SupportStatus debugGetSupportStatus() const override { return kSupportStatusNone; }
+	SupportStatus debugGetSupportStatus() const override { return kSupportStatusDone; }
 #endif
 
 private:


Commit: f5db27d95107b7ee0df2e59c9475be427f6d01d8
    https://github.com/scummvm/scummvm/commit/f5db27d95107b7ee0df2e59c9475be427f6d01d8
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-26T22:57:13-04:00

Commit Message:
MTROPOLIS: Fix incorrect "opint" flags.  Fix returns not moving ATD scenes from the scene stack.

Changed paths:
    engines/mtropolis/runtime.cpp


diff --git a/engines/mtropolis/runtime.cpp b/engines/mtropolis/runtime.cpp
index c9c7db7715a..aaf7aa3cd29 100644
--- a/engines/mtropolis/runtime.cpp
+++ b/engines/mtropolis/runtime.cpp
@@ -2772,8 +2772,9 @@ MiniscriptInstructionOutcome WorldManagerInterface::setCurrentScene(MiniscriptTh
 		return kMiniscriptInstructionOutcomeFailed;
 	}
 
-	bool addToReturnList = (_opInt & 0x01) != 0;
-	thread->getRuntime()->addSceneStateTransition(HighLevelSceneTransition(scene->getSelfReference().lock().staticCast<Structural>(), HighLevelSceneTransition::kTypeChangeToScene, false, addToReturnList));
+	bool addToReturnList = (_opInt & 0x02) != 0;
+	bool addToDest = (_opInt & 0x01) != 0;
+	thread->getRuntime()->addSceneStateTransition(HighLevelSceneTransition(scene->getSelfReference().lock().staticCast<Structural>(), HighLevelSceneTransition::kTypeChangeToScene, addToDest, addToReturnList));
 
 	return kMiniscriptInstructionOutcomeContinue;
 }
@@ -4955,6 +4956,13 @@ void Runtime::executeHighLevelSceneTransition(const HighLevelSceneTransition &tr
 
 					queueEventAsLowLevelSceneStateTransitionAction(Event(EventIDs::kSceneReactivated, 0), sceneReturn.scene.get(), true, true);
 
+					for (uint i = 1; i < _sceneStack.size(); i++) {
+						if (_sceneStack[i].scene == _activeMainScene) {
+							_sceneStack.remove_at(i);
+							break;
+						}
+					}
+
 					_activeMainScene = sceneReturn.scene;
 
 					executeSharedScenePostSceneChangeActions();