[Scummvm-git-logs] scummvm master -> 3705880357583ab136e8561ce8782b30331be78f

eriktorbjorn noreply at scummvm.org
Thu Feb 8 20:55:15 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:
3705880357 HOPKINS: Fix loadMusic() regression


Commit: 3705880357583ab136e8561ce8782b30331be78f
    https://github.com/scummvm/scummvm/commit/3705880357583ab136e8561ce8782b30331be78f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-02-08T21:53:25+01:00

Commit Message:
HOPKINS: Fix loadMusic() regression

We tried to open the base filename, without the .MOD or .TWA extension,
since append() returns the new filename, rather than appending in place.

Changed paths:
    engines/hopkins/sound.cpp


diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index e84b33befdd..eccfafd9535 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -417,7 +417,7 @@ void SoundManager::loadMusic(const Common::Path &file) {
 	Common::File f;
 	if (_vm->getPlatform() == Common::kPlatformOS2 || _vm->getPlatform() == Common::kPlatformBeOS) {
 		Common::Path filename(file);
-		filename.append(".MOD");
+		filename.appendInPlace(".MOD");
 
 		if (!f.open(filename))
 			error("Error opening file %s", filename.toString().c_str());
@@ -438,7 +438,7 @@ void SoundManager::loadMusic(const Common::Path &file) {
 
 	} else {
 		Common::Path filename(file);
-		filename.append(".TWA");
+		filename.appendInPlace(".TWA");
 
 		if (!f.open(filename))
 			error("Error opening file %s", filename.toString().c_str());




More information about the Scummvm-git-logs mailing list