[Scummvm-git-logs] scummvm master -> 0ad2ebc9c484711a5fc82872914e868d7e875066
athrxx
noreply at scummvm.org
Fri Feb 9 15:07:46 UTC 2024
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:
0ad2ebc9c4 SCUMM: (INDY4/MAC) - minor fix
Commit: 0ad2ebc9c484711a5fc82872914e868d7e875066
https://github.com/scummvm/scummvm/commit/0ad2ebc9c484711a5fc82872914e868d7e875066
Author: athrxx (athrxx at scummvm.org)
Date: 2024-02-09T16:06:00+01:00
Commit Message:
SCUMM: (INDY4/MAC) - minor fix
Changed paths:
engines/scumm/players/player_mac_indy3.cpp
diff --git a/engines/scumm/players/player_mac_indy3.cpp b/engines/scumm/players/player_mac_indy3.cpp
index 3b8e8b98845..08bbfcec3aa 100644
--- a/engines/scumm/players/player_mac_indy3.cpp
+++ b/engines/scumm/players/player_mac_indy3.cpp
@@ -241,10 +241,10 @@ private:
void addTriplet(uint16 frequency, uint16 amplitude);
struct Triplet {
- Triplet(uint16 cnt, uint16 ampl, uint16 dur) : count(cnt), amplitude(ampl & 0xff), duration(dur) {}
+ Triplet(uint16 cnt, uint16 ampl, uint16 dur) : count(cnt), amplitude(ampl), duration(dur) {}
Triplet() : Triplet(0xffff, 0xffff, 1) {}
Triplet &&fromScumm() { count = (count / 3) * 2; duration = MAX<uint8>(duration, 1); return Common::move(*this); }
- void toHardware(uint32 &dstCount, uint8 &dstAmpl, uint16 &dstDur) { dstCount = count ? 0x58000000 / (5 * count) : 0; dstAmpl = amplitude >> 1; dstDur = duration; }
+ void toHardware(uint32 &dstCount, uint8 &dstAmpl, uint16 &dstDur) { dstCount = count ? 0x58000000 / (5 * count) : 0; dstAmpl = (amplitude & 0xff) >> 1; dstDur = duration; }
uint16 count;
uint16 amplitude;
uint16 duration;
More information about the Scummvm-git-logs
mailing list