[Scummvm-git-logs] scummvm branch-2-8 -> d803e35d8d259621b6fdc93e293c4bed51853ec0

[moralrecordings]

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:
b871fdd7e6 DIRECTOR: Fix chan/mk debugger commands
ec616cff4f DIRECTOR: Fix linebreak format for the labelList
d803e35d8d DIRECTOR: Change assert to no-op when queueing events


Commit: b871fdd7e6651afcedcdbddf4468aa1aa15927cf
    https://github.com/scummvm/scummvm/commit/b871fdd7e6651afcedcdbddf4468aa1aa15927cf
Author: Scott Percival (code at moral.net.au)
Date: 2024-01-12T12:30:01+08:00

Commit Message:
DIRECTOR: Fix chan/mk debugger commands

Changed paths:
    engines/director/debugger.cpp


diff --git a/engines/director/debugger.cpp b/engines/director/debugger.cpp
index 0d5dfb00057..7c0366c493d 100644
--- a/engines/director/debugger.cpp
+++ b/engines/director/debugger.cpp
@@ -336,7 +336,7 @@ bool Debugger::cmdChannels(int argc, const char **argv) {
 
 	if (frameId >= 1 && frameId <= maxSize) {
 		debugPrintf("Channel info for frame %d of %d\n", frameId, maxSize);
-		Frame *frame = score->getFrameData(frameId-1);
+		Frame *frame = score->getFrameData(frameId);
 		debugPrintf("%s\n", frame->formatChannelInfo().c_str());
 		delete frame;
 	} else {
@@ -595,7 +595,7 @@ bool Debugger::cmdMarkers(int argc, const char **argv) {
 	if (score->_labels && score->_labels->size()) {
 		debugPrintf("Score markers:\n");
 		for (auto &it : *score->_labels) {
-			debugPrintf("\"%s\" -> %d", it->name.c_str(), it->number);
+			debugPrintf("\"%s\" -> %d\n", it->name.c_str(), it->number);
 		}
 	} else {
 		debugPrintf("No score markers found.\n");


Commit: ec616cff4f36e7fb45dfccc4473f3567f637691f
    https://github.com/scummvm/scummvm/commit/ec616cff4f36e7fb45dfccc4473f3567f637691f
Author: Scott Percival (code at moral.net.au)
Date: 2024-01-12T12:30:01+08:00

Commit Message:
DIRECTOR: Fix linebreak format for the labelList

Fixes inability to close the database after opening it for the first
time in Team Xtreme: Operation Weather Disaster.

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 46d0d9ef794..7b99bbc96b2 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -161,7 +161,7 @@ Common::String *Score::getLabelList() {
 
 	for (auto &i : *_labels) {
 		*res += i->name;
-		*res += '\n';
+		*res += '\r';
 	}
 
 	return res;


Commit: d803e35d8d259621b6fdc93e293c4bed51853ec0
    https://github.com/scummvm/scummvm/commit/d803e35d8d259621b6fdc93e293c4bed51853ec0
Author: Scott Percival (code at moral.net.au)
Date: 2024-01-12T12:30:01+08:00

Commit Message:
DIRECTOR: Change assert to no-op when queueing events

Apparently it is possible to send events if there are no frames (e.g. a
movie with no Score data and a script which redirects to another movie).

Fixes occasional crashes when starting Team Xtreme: Operation Weather
Disaster.

Changed paths:
    engines/director/lingo/lingo-events.cpp


diff --git a/engines/director/lingo/lingo-events.cpp b/engines/director/lingo/lingo-events.cpp
index c33b69e2a8e..f9b3d95d499 100644
--- a/engines/director/lingo/lingo-events.cpp
+++ b/engines/director/lingo/lingo-events.cpp
@@ -161,7 +161,9 @@ void Movie::queueFrameEvent(Common::Queue<LingoEvent> &queue, LEvent event, int
 	// 	entity = score->getCurrentFrameNum();
 	// } else {
 
-	assert(_score->_currentFrame != nullptr);
+	if (_score->_currentFrame == nullptr)
+		return;
+
 	CastMemberID scriptId = _score->_currentFrame->_mainChannels.actionId;
 	if (!scriptId.member)
 		return;