[Scummvm-git-logs] scummvm master -> 7f001a796656e4c8a126a70a920bfd52955d8c69

Die4Ever 30947252+Die4Ever at users.noreply.github.com
Fri Sep 17 03:46:20 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:
7f001a7966 GROOVIE: fix Clan music on Mac/iOS


Commit: 7f001a796656e4c8a126a70a920bfd52955d8c69
    https://github.com/scummvm/scummvm/commit/7f001a796656e4c8a126a70a920bfd52955d8c69
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2021-09-16T22:44:14-05:00

Commit Message:
GROOVIE: fix Clan music on Mac/iOS

Changed paths:
    engines/groovie/logic/t11hgame.cpp
    engines/groovie/music.cpp


diff --git a/engines/groovie/logic/t11hgame.cpp b/engines/groovie/logic/t11hgame.cpp
index f1b414be21..ae31189125 100644
--- a/engines/groovie/logic/t11hgame.cpp
+++ b/engines/groovie/logic/t11hgame.cpp
@@ -109,6 +109,10 @@ void T11hGame::opMouseTrap() {
 	// variable 24 is the mouse?
 	//_scriptVariables[24] = 2;
 
+	// player wins: _scriptVariables[22] = 1;
+	// stauf wins: _scriptVariables[22] = 2;
+	// allows the player to click to place the mouse somewhere? _scriptVariables[5] = 0;
+
 	switch (op) {
 	case 0:
 		break;
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 17f7124eb0..a7add7d57b 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -797,7 +797,7 @@ bool MusicPlayerTlc::load(uint32 fileref, bool loop) {
 	Common::String filename = getFilename(fileref);
 
 	// Apple platforms use m4a files instead of mpg
-	if (_vm->getPlatform() == Common::kPlatformMacintosh || _vm->getPlatform() == Common::kPlatformIOS)
+	if (_vm->getPlatform() == Common::kPlatformUnknown)
 		filename += ".m4a";
 	else
 		filename += ".mpg";




More information about the Scummvm-git-logs mailing list