[Scummvm-git-logs] scummvm master -> 808f8f679e658702614935c44c0d4b96ffac0b00

phcoder noreply at scummvm.org
Thu Dec 15 15:59:20 UTC 2022


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:
808f8f679e SAGA: Rename playAmigaMod to playProtracker


Commit: 808f8f679e658702614935c44c0d4b96ffac0b00
    https://github.com/scummvm/scummvm/commit/808f8f679e658702614935c44c0d4b96ffac0b00
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-12-15T16:58:49+01:00

Commit Message:
SAGA: Rename playAmigaMod to playProtracker

Changed paths:
    engines/saga/music.cpp
    engines/saga/music.h


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 90aafa237eb..2262234c191 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -337,7 +337,7 @@ void Music::play(uint32 resourceId, MusicFlags flags) {
 	if (!digital) {
 		// Load MIDI/XMI resource data
 		if (_vm->getGameId() == GID_ITE && _vm->getPlatform() == Common::Platform::kPlatformAmiga) {
-			playAmigaMod(resourceId, flags);
+			playProtracker(resourceId, flags);
 		} else if (_vm->getGameId() == GID_IHNM && _vm->isMacResources()) {
 			// Load the external music file for Mac IHNM
 			playQuickTime(resourceId, flags);
@@ -470,7 +470,7 @@ void Music::playQuickTime(uint32 resourceId, MusicFlags flags) {
 	_parser->setTrack(0);
 }
 
-void Music::playAmigaMod(uint32 resourceId, MusicFlags flags) {
+void Music::playProtracker(uint32 resourceId, MusicFlags flags) {
 	ByteArray ba;
 
 	_vm->_resource->loadResource(_musicContext, resourceId, ba);
diff --git a/engines/saga/music.h b/engines/saga/music.h
index 33455220579..5240e55f6ce 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -96,8 +96,8 @@ private:
 	static void timerCallback(void *refCon);
 	void onTimer();
 	bool playDigital(uint32 resourceId, MusicFlags flags);
+	void playProtracker(uint32 resourceId, MusicFlags flags);
 	void playQuickTime(uint32 resourceId, MusicFlags flags);
-	void playAmigaMod(uint32 resourceId, MusicFlags flags);
 	void playMidi(uint32 resourceId, MusicFlags flags);
 	void musicVolumeGauge();
 	ByteArray *_currentMusicBuffer;




More information about the Scummvm-git-logs mailing list