[Scummvm-git-logs] scummvm master -> 445e4909f3f1b427a99e5e979ff31b11e26c1dcc

[athrxx]

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:
c3b97460c3 FREESCAPE: fix msvc build
445e4909f3 SCUMM: (MI1/Mac) - minor sound player cleanup


Commit: c3b97460c311d916011ce1bb2ed545418443c776
    https://github.com/scummvm/scummvm/commit/c3b97460c311d916011ce1bb2ed545418443c776
Author: athrxx (athrxx at scummvm.org)
Date: 2024-03-09T16:23:49+01:00

Commit Message:
FREESCAPE: fix msvc build

Changed paths:
    engines/freescape/sound.cpp


diff --git a/engines/freescape/sound.cpp b/engines/freescape/sound.cpp
index beb6a569c63..0b44979ba70 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -129,7 +129,7 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 						soundUnitZX soundUnit;
 						soundUnit.tStates = var5;
 						soundUnit.freqTimesSeconds = SFXtempStruct[3] | (SFXtempStruct[4] << 8);
-						soundUnit.multiplier = 1.8;
+						soundUnit.multiplier = 1.8f;
 						//debug("playSFX(%x, %x)", soundUnit.freqTimesSeconds, soundUnit.tStates);
 						_soundsSpeakerFxZX[i]->push_back(soundUnit);
 						repetitions = repetitions - 1;


Commit: 445e4909f3f1b427a99e5e979ff31b11e26c1dcc
    https://github.com/scummvm/scummvm/commit/445e4909f3f1b427a99e5e979ff31b11e26c1dcc
Author: athrxx (athrxx at scummvm.org)
Date: 2024-03-09T16:24:04+01:00

Commit Message:
SCUMM: (MI1/Mac) - minor sound player cleanup

Changed paths:
    engines/scumm/players/player_mac_loom_monkey.cpp


diff --git a/engines/scumm/players/player_mac_loom_monkey.cpp b/engines/scumm/players/player_mac_loom_monkey.cpp
index a30e9f6b109..c15f9c4a565 100644
--- a/engines/scumm/players/player_mac_loom_monkey.cpp
+++ b/engines/scumm/players/player_mac_loom_monkey.cpp
@@ -82,8 +82,6 @@ protected:
 	byte _isMusic;
 	byte _sndRes9;
 	byte _sndRes10;
-	byte _sndRes11;
-	byte _sndRes12;
 	uint16 _chanSetup;
 	uint16 _timbre;
 	bool _loop;
@@ -161,7 +159,7 @@ MacSndLoader::Instrument::Instrument(uint32 id, Common::SeekableReadStream *&in,
 	_snd.data = Common::SharedPtr<const byte>(buff, Common::ArrayDeleter<const byte>());
 }
 
-MacSndLoader::MacSndLoader(bool useInstrTag) : _sndRes6(0), _isMusic(0), _sndRes9(0), _sndRes10(0), _sndRes11(0), _sndRes12(0), _chanSetup(0),
+MacSndLoader::MacSndLoader(bool useInstrTag) : _sndRes6(0), _isMusic(0), _sndRes9(0), _sndRes10(0), _chanSetup(0),
 	_timbre(0), _useInstrTag(useInstrTag), _synth(0), _loop(false) {
 	memset(_chanInstr, 0, sizeof(_chanInstr));
 	memset(_chanInstr2, 0, sizeof(_chanInstr2));
@@ -315,7 +313,7 @@ bool MonkeyMacSndLoader::loadSound(const byte *data, uint32 dataSize) {
 	_isMusic = data[13];
 	_sndRes10 = data[10];
 	_chanSetup = data[11];
-	_sndRes12 = data[12];
+	_timbre = data[12];
 
 	for (int i = 0; i < 4; ++i) {
 		uint32 offs = READ_BE_UINT32(data + 16 + 4 * i);