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

[neuromancer]

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:
fba53d546a HYPNO: correctly execute escape when a conversation finishes + debug channels


Commit: fba53d546aa8f26079859d910e8de51d3172482d
    https://github.com/scummvm/scummvm/commit/fba53d546aa8f26079859d910e8de51d3172482d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2021-11-06T22:32:18+01:00

Commit Message:
HYPNO: correctly execute escape when a conversation finishes + debug channels

Changed paths:
    engines/hypno/scene.cpp
    engines/hypno/spider/talk.cpp


diff --git a/engines/hypno/scene.cpp b/engines/hypno/scene.cpp
index 37509c44fe..ebf2cab187 100644
--- a/engines/hypno/scene.cpp
+++ b/engines/hypno/scene.cpp
@@ -74,7 +74,7 @@ void HypnoEngine::loadSceneLevel(const Common::String &current, const Common::St
 	test.read(buf, fileSize);
 	test.close();
 	buf[fileSize] = '\0';
-	debug("%s", buf);
+	debugC(1, kHypnoDebugParser, "%s", buf);
 	parse_mis(buf);
 	Level level;
 	level.scene.prefix = prefix;
@@ -391,7 +391,6 @@ void HypnoEngine::runScene(Scene &scene) {
 
 		if (!_videosPlaying.empty() || !_nextSequentialVideoToPlay.empty()) {
 			drawScreen();
-			debug("videosPlaying size: %d, _nextSequentialVideoToPlay size: %d", _videosPlaying.size(), _nextSequentialVideoToPlay.size());
 			continue;
 		}
 
diff --git a/engines/hypno/spider/talk.cpp b/engines/hypno/spider/talk.cpp
index 977367b56d..3da007a1ec 100644
--- a/engines/hypno/spider/talk.cpp
+++ b/engines/hypno/spider/talk.cpp
@@ -63,8 +63,10 @@ void SpiderEngine::showConversation() {
 			Talk *a = (Talk *)*it;
 			if (!a->second.empty())
 				_nextParallelVideoToPlay.push_back(MVideo(a->second, a->secondPos, false, false, false));
-			if (a->escape)
-				runEscape();
+			if (a->escape) {
+				_nextSequentialVideoToPlay = _escapeSequentialVideoToPlay;
+				_escapeSequentialVideoToPlay.clear();
+			}
 		}
 		debugC(1, kHypnoDebugScene, "Clearing conversation");
 		_conversation.clear();