[Scummvm-git-logs] scummvm master -> 844dd8ea91f87d29e6fb0fc81fcdbb0b9d6e186e

antoniou79 a.antoniou79 at gmail.com
Mon Aug 2 13:14:04 UTC 2021


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:
844dd8ea91 BLADERUNNER: Init ambient sound track fields always


Commit: 844dd8ea91f87d29e6fb0fc81fcdbb0b9d6e186e
    https://github.com/scummvm/scummvm/commit/844dd8ea91f87d29e6fb0fc81fcdbb0b9d6e186e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-08-02T16:13:01+03:00

Commit Message:
BLADERUNNER: Init ambient sound track fields always

At constructor and "removeNonLoopingSoundByIndex" functions

Changed paths:
    engines/bladerunner/ambient_sounds.cpp


diff --git a/engines/bladerunner/ambient_sounds.cpp b/engines/bladerunner/ambient_sounds.cpp
index 3ebd8f8f87..79d1e9f165 100644
--- a/engines/bladerunner/ambient_sounds.cpp
+++ b/engines/bladerunner/ambient_sounds.cpp
@@ -51,11 +51,37 @@ AmbientSounds::AmbientSounds(BladeRunnerEngine *vm) {
 	for (int i = 0; i != kNonLoopingSounds; ++i) {
 		NonLoopingSound &track = _nonLoopingSounds[i];
 		track.isActive = false;
+#if !BLADERUNNER_ORIGINAL_BUGS
+		track.name.clear();
+		track.hash = 0;
+		track.audioPlayerTrack = -1;
+		track.delayMin = 0u;
+		track.delayMax = 0u;
+		track.nextPlayTimeStart = 0u;
+		track.nextPlayTimeDiff = 0u;
+		track.volumeMin = 0;
+		track.volumeMax = 0;
+		track.volume = 0;
+		track.panStartMin = 0;
+		track.panStartMax = 0;
+		track.panEndMin = 0;
+		track.panEndMax = 0;
+		track.priority = 0;
+		track.soundType = -1;
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 	}
 
 	for (int i = 0; i != kLoopingSounds; ++i) {
 		LoopingSound &track = _loopingSounds[i];
 		track.isActive = false;
+#if !BLADERUNNER_ORIGINAL_BUGS
+		track.name.clear();
+		track.hash = 0;
+		track.audioPlayerTrack = -1;
+		track.volume = 0;
+		track.pan = 0;
+		track.soundType = -1;
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 	}
 }
 
@@ -411,6 +437,22 @@ void AmbientSounds::removeNonLoopingSoundByIndex(int index, bool stopPlaying) {
 	track.audioPlayerTrack = -1;
 	//	track.field_45 = 0;
 	track.soundType = -1;
+#if !BLADERUNNER_ORIGINAL_BUGS
+	track.name.clear();
+	track.hash = 0;
+	track.delayMin = 0u;
+	track.delayMax = 0u;
+	track.nextPlayTimeStart = 0u;
+	track.nextPlayTimeDiff = 0u;
+	track.volumeMin = 0;
+	track.volumeMax = 0;
+	track.volume = 0;
+	track.panStartMin = 0;
+	track.panStartMax = 0;
+	track.panEndMin = 0;
+	track.panEndMax = 0;
+	track.priority = 0;
+#endif // !BLADERUNNER_ORIGINAL_BUGS
 }
 
 void AmbientSounds::removeLoopingSoundByIndex(int index, uint32 delaySeconds) {




More information about the Scummvm-git-logs mailing list