[Scummvm-git-logs] scummvm master -> 03a2bf85b070988c1cdc5906cfb0626122b7a15c

[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:
c5ef168572 SCUMM: (LOOM) - extend cursor postload fix to all versions
03a2bf85b0 AUDIO: (FM-TOWNS) - slightly adjust CD volume control


Commit: c5ef168572e12b74816dadaa4486fa70f153a947
    https://github.com/scummvm/scummvm/commit/c5ef168572e12b74816dadaa4486fa70f153a947
Author: athrxx (athrxx at scummvm.org)
Date: 2024-03-03T15:01:31+01:00

Commit Message:
SCUMM: (LOOM) - extend cursor postload fix to all versions

I have encountered the bug with the 0 width/height
cursor in the FM-Towns version, too.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 3bdcbed12b1..cd0913afbe0 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1530,11 +1530,15 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 			_cursor.height = 15;
 			_cursor.hotspotX = 7;
 			_cursor.hotspotY = 7;
-		} else if (_game.id == GID_LOOM && _game.platform == Common::kPlatformMacintosh) {
+		} else if (_game.id == GID_LOOM) {
 			_cursor.width = 16;
 			_cursor.height = 16;
-			_cursor.hotspotX = 3;
-			_cursor.hotspotY = 2;
+			if (_game.platform == Common::kPlatformMacintosh) {
+				_cursor.hotspotX = 3;
+				_cursor.hotspotY = 2;
+			} else { // DOS, Amiga, FM-Towns and PCE
+				_cursor.hotspotX = _cursor.hotspotY = 0;
+			}
 		}
 	}
 


Commit: 03a2bf85b070988c1cdc5906cfb0626122b7a15c
    https://github.com/scummvm/scummvm/commit/03a2bf85b070988c1cdc5906cfb0626122b7a15c
Author: athrxx (athrxx at scummvm.org)
Date: 2024-03-03T15:01:37+01:00

Commit Message:
AUDIO: (FM-TOWNS) - slightly adjust CD volume control

(Make it logaritmic instead of just linear. This improves the
music volume in Loom when using the distaff)

Changed paths:
    audio/softsynth/fmtowns_pc98/towns_audio.cpp


diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 768f30a50ed..6f82e85d67e 100644
--- a/audio/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -1515,7 +1515,7 @@ void TownsAudioInterfaceInternal::updateOutputVolumeInternal() {
 	// CD-AUDIO
 	uint32 maxVol = MAX(_outputLevel[12] * (_outputMute[12] ^ 1), _outputLevel[13] * (_outputMute[13] ^ 1));
 
-	int volume = (int)(((float)(maxVol * 255) / 63.0f));
+	int volume = (int)(((powf(maxVol, 1.5f) * 255.0f) / powf(63.0f, 1.5f)));
 	int balance = maxVol ? (int)( ( ((int)_outputLevel[13] * (_outputMute[13] ^ 1) - _outputLevel[12] * (_outputMute[12] ^ 1)) * 127) / (float)maxVol) : 0;
 
 	g_system->getAudioCDManager()->setVolume(volume);