[Scummvm-git-logs] scummvm master -> 8fe4c0a2be5062f64a4259b77c2382b6bede79a6

athrxx athrxx at scummvm.org
Mon Nov 8 22:23:24 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:
8fe4c0a2be KYRA: (LoK/Mac) - fix gcc warning


Commit: 8fe4c0a2be5062f64a4259b77c2382b6bede79a6
    https://github.com/scummvm/scummvm/commit/8fe4c0a2be5062f64a4259b77c2382b6bede79a6
Author: athrxx (athrxx at scummvm.org)
Date: 2021-11-08T23:22:47+01:00

Commit Message:
KYRA: (LoK/Mac) - fix gcc warning

Changed paths:
    engines/kyra/sound/drivers/halestorm.cpp


diff --git a/engines/kyra/sound/drivers/halestorm.cpp b/engines/kyra/sound/drivers/halestorm.cpp
index a8406542be..5d238061de 100644
--- a/engines/kyra/sound/drivers/halestorm.cpp
+++ b/engines/kyra/sound/drivers/halestorm.cpp
@@ -329,6 +329,7 @@ private:
 	};
 
 	struct InstrumentEntry {
+		InstrumentEntry() : status(0), transpose(0), flags(0), flags2(0), refinst(0), sndRes(), pmData(), _noteRangeSubsets() {}
 		enum {
 			kUnusable = -1,
 			kRequestLoad = 0,
@@ -624,8 +625,7 @@ HSAudioStream *HSLowLevelDriver::init(uint32 scummVMOutputrate, bool output16bit
 	_chan = new HSSoundChannel[16];
 	memset(_chan, 0, sizeof(HSSoundChannel) * 16);
 
-	_instruments = new InstrumentEntry[128];
-	memset(_instruments, 0, sizeof(InstrumentEntry) * 128);
+	_instruments = new InstrumentEntry[128]();
 
 	_trackState = new MidiTrackState[24];
 	memset(_trackState, 0, 24 * sizeof(MidiTrackState));




More information about the Scummvm-git-logs mailing list