[Scummvm-git-logs] scummvm master -> 3d65d22964c8225bade9cc24049e16312781f412

[mistydemeo]

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:
0d3b802504 DIRECTOR: Mac version of nemurenu
3d65d22964 DIRECTOR: Sound: handle _loopEnd==_loopStart


Commit: 0d3b802504562336a6f984698a2b8ff71bfa52de
    https://github.com/scummvm/scummvm/commit/0d3b802504562336a6f984698a2b8ff71bfa52de
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-04-02T12:41:53-07:00

Commit Message:
DIRECTOR: Mac version of nemurenu

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index a28fbe65ecd..0120e92ea08 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1878,6 +1878,9 @@ static const DirectorGameDescription gameDescriptions[] = {
 	// Decomposed variant of the above
 	MACGAME1_l("japanart07", "", "xn-- -17t4bh9etpa0pa0nxb5n6jma0692i", "f5277c53bacd27936158dd3867e587e2", 392401, Common::JA_JPN, 310),
 
+	// Original filename is 'çœ ã‚Œã¬å¤œã®å°ã•ãªãŠè©±'
+	MACGAME1t_l("nemurenu", "", "xn--t8jva7dgk2pt90zv6ev54ednzb", "8b642579d69604d2e08da5b7f70e403c", 392381, Common::JA_JPN, 311),
+
 	MACGAME1_l("overringunder", "", "Over-Ring-Under", "9f0bb7ec7720e4f680ee3aa3d22c1c9d", 910381, Common::JA_JPN, 300),
 
 	// Original filename is ~LEGEND OF PSY•S CITY~


Commit: 3d65d22964c8225bade9cc24049e16312781f412
    https://github.com/scummvm/scummvm/commit/3d65d22964c8225bade9cc24049e16312781f412
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-04-02T12:41:54-07:00

Commit Message:
DIRECTOR: Sound: handle _loopEnd==_loopStart

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 9865e22ea27..3c5210adea9 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -779,11 +779,12 @@ Audio::AudioStream *SNDDecoder::getAudioStream(bool looping, bool forPuppet, Dis
 	if (looping) {
 		if (hasLoopBounds()) {
 			// FIXME: determine the correct behaviour for non-consecutive loop bounds
-			if (_loopEnd < _loopStart) {
+			if (_loopEnd <= _loopStart) {
 				warning("SNDDecoder::getAudioStream: Looping sound has non-consecutive bounds, using entire sample");
 				return new Audio::LoopingAudioStream(stream, 0);
 			} else {
 				// Return an automatically looping stream.
+				debugC(5, kDebugSound, "DirectorSound::getAudioStream(): returning a loop at positions start: %i, end: %i", _loopStart, _loopEnd);
 				return new Audio::SubLoopingAudioStream(stream, 0, Audio::Timestamp(0, _loopStart, _rate), Audio::Timestamp(0, _loopEnd, _rate));
 			}
 		} else {