[Scummvm-git-logs] scummvm master -> 4d5b490695855aab88624cb0433dd88354e90e61

[athrxx]

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:
4d5b490695 SCUMM: (SCUMM8) - fix restart (F8) dialog glitch


Commit: 4d5b490695855aab88624cb0433dd88354e90e61
    https://github.com/scummvm/scummvm/commit/4d5b490695855aab88624cb0433dd88354e90e61
Author: athrxx (athrxx at scummvm.org)
Date: 2021-08-29T18:06:57+02:00

Commit Message:
SCUMM: (SCUMM8) - fix restart (F8) dialog glitch

During smush movie playback the engine simply wouldn't react to a restart attempt (except causing a palette glitch). Now it apparently works...

I'd still strongly discourage anyone from using this, since it might make the engine unstable (see the old comments in ScummEngine::restart()).

Changed paths:
    engines/scumm/scumm.cpp
    engines/scumm/scumm_v7.h


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 71c773870c..520f9e0c70 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1962,6 +1962,13 @@ void ScummEngine_v6::resetScumm() {
 	setDefaultCursor();
 }
 
+#ifdef ENABLE_SCUMM_7_8
+void ScummEngine_v7::resetScumm() {
+	_smushVideoShouldFinish = true;
+	ScummEngine_v6::resetScumm();
+}
+#endif
+
 void ScummEngine_v60he::resetScumm() {
 	ScummEngine_v6::resetScumm();
 
diff --git a/engines/scumm/scumm_v7.h b/engines/scumm/scumm_v7.h
index a774ff0b7d..f48ab8530c 100644
--- a/engines/scumm/scumm_v7.h
+++ b/engines/scumm/scumm_v7.h
@@ -106,6 +106,7 @@ protected:
 	void processKeyboard(Common::KeyState lastKeyHit) override;
 
 	void setupScumm(const Common::String &macResourceFile) override;
+	void resetScumm() override;
 
 	void setupScummVars() override;
 	void resetScummVars() override;