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

[sev-]

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:
02bc85e09f QDENGINE: Improved debug output
4da50f8655 QDENGINE: Fix crash when sound is not available


Commit: 02bc85e09f6a5615132ad873232d33e4740abe74
    https://github.com/scummvm/scummvm/commit/02bc85e09f6a5615132ad873232d33e4740abe74
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-02T00:23:25+02:00

Commit Message:
QDENGINE: Improved debug output

Changed paths:
    engines/qdengine/system/graphics/gr_tile_animation.cpp


diff --git a/engines/qdengine/system/graphics/gr_tile_animation.cpp b/engines/qdengine/system/graphics/gr_tile_animation.cpp
index 959500bc765..5ae6716b392 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_animation.cpp
@@ -259,7 +259,7 @@ bool grTileAnimation::load(Common::SeekableReadStream *fh, int version) {
 		_tileData[i] = fh->readUint32LE();
 	}
 
-	debugC(2, kDebugLoad, "  --> grTileAnimation::load(): pos: %ld remaining: %ld", fh->pos(), fh->size() - fh->pos());
+	debugC(debugLevel, kDebugLoad, "  --> grTileAnimation::load(): pos: %ld remaining: %ld", fh->pos(), fh->size() - fh->pos());
 
 	return true;
 }


Commit: 4da50f86551c0c39f94ee4bd0368fcedef41fe33
    https://github.com/scummvm/scummvm/commit/4da50f86551c0c39f94ee4bd0368fcedef41fe33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-09-02T00:23:46+02:00

Commit Message:
QDENGINE: Fix crash when sound is not available

pilots3 have reference to two non-existing sounds. Now report it
instead of crashing.

Changed paths:
    engines/qdengine/system/sound/snd_sound.cpp


diff --git a/engines/qdengine/system/sound/snd_sound.cpp b/engines/qdengine/system/sound/snd_sound.cpp
index ff9ce1e1f85..f7cbefee1cc 100644
--- a/engines/qdengine/system/sound/snd_sound.cpp
+++ b/engines/qdengine/system/sound/snd_sound.cpp
@@ -48,7 +48,12 @@ bool sndSound::release_sound_buffer() {
 }
 
 bool sndSound::play() {
-	debugC(5, kDebugSound, "sndSound::play(). this: %p",  (void *)this);
+	debugC(5, kDebugSound, "sndSound::play(). %s",  transCyrillic(_sound->_fname.toString()));
+
+	if (!_sound->_audioStream) {
+		warning("sndSound::play(): audioStream is null for '%s'", transCyrillic(_sound->_fname.toString()));
+		return false;
+	}
 
 	_flags &= ~SOUND_FLAG_PAUSED;