[Scummvm-git-logs] scummvm master -> 0eca8009f2289a146a82591a7060f7e9a734b4bf

[sluicebox]

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:
0eca8009f2 SCI32: Implement kMacPlatform32 volume subop


Commit: 0eca8009f2289a146a82591a7060f7e9a734b4bf
    https://github.com/scummvm/scummvm/commit/0eca8009f2289a146a82591a7060f7e9a734b4bf
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-05-07T22:49:41-07:00

Commit Message:
SCI32: Implement kMacPlatform32 volume subop

Changed paths:
    engines/sci/engine/kmisc.cpp


diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index bcdfdfce20..a022944557 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -704,10 +704,9 @@ reg_t kMacPlatform32(EngineState *s, int argc, reg_t *argv) {
 	case 11:
 		return kMakeSaveFileName(s, argc - 1, argv + 1);
 
-	// TODO: Phantasmagoria music volume adjustment [ 0-15 ]
+	// Phantasmagoria volume
 	case 12:
-		warning("Unimplemented kMacPlatform32(%d): Set volume: %d", argv[0].toUint16(), argv[1].toUint16());
-		return s->r_acc;
+		return g_sci->_soundCmd->kDoSoundMasterVolume(s, argc - 1, argv + 1);
 
 	default:
 		break;