[Scummvm-git-logs] scummvm master -> 6bff7563bc83dffae511f8327515f2c8fb14e215

[whoozle]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
6bff7563bc PHOENIXVR: do not save/load music tracks as regular sounds


Commit: 6bff7563bc83dffae511f8327515f2c8fb14e215
    https://github.com/scummvm/scummvm/commit/6bff7563bc83dffae511f8327515f2c8fb14e215
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-03-08T21:39:12Z

Commit Message:
PHOENIXVR: do not save/load music tracks as regular sounds

Changed paths:
    engines/phoenixvr/phoenixvr.cpp


diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index 015274c1477..42f0b37725f 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -1002,13 +1002,14 @@ void PhoenixVREngine::captureContext() {
 	};
 	Common::Array<SoundState> sounds, sounds3d;
 	for (auto &kv : _sounds) {
+		auto &name = kv._key;
 		auto &sound = kv._value;
-		if (sound.loops >= 0)
+		if (sound.loops >= 0 || name == _currentMusic)
 			continue;
 		if (sound.spatial)
-			sounds3d.push_back({kv._key, sound.volume, fromAngle(sound.angle)});
+			sounds3d.push_back({name, sound.volume, fromAngle(sound.angle)});
 		else
-			sounds.push_back({kv._key, sound.volume, 0});
+			sounds.push_back({name, sound.volume, 0});
 	}
 
 	// sound samples
@@ -1105,7 +1106,7 @@ bool PhoenixVREngine::enterScript() {
 		auto vol = ms.readUint32LE();
 		auto flags = ms.readUint32LE();
 		debug("sound: %s vol: %u flags: %u", name.c_str(), vol, flags);
-		if (!name.empty())
+		if (!name.empty() && name != _currentMusic)
 			playSound(name, Audio::Mixer::kSFXSoundType, vol, -1);
 	}