[Scummvm-git-logs] scummvm master -> 62da6d657cc1d56b1cb77905ab895b22ffb35b10

[Strangerke]

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

Summary:
8155bbc3c6 M4: RIDDLE: Room 303 - fix logic to return to room 304
62da6d657c GOT: Revert accidental change in f0bb3d51fad47c82a3fd24fe5f36b9778d8664c5


Commit: 8155bbc3c6a9df7447b29147b99cdd0afea1290c
    https://github.com/scummvm/scummvm/commit/8155bbc3c6a9df7447b29147b99cdd0afea1290c
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-20T11:25:55+01:00

Commit Message:
M4: RIDDLE: Room 303 - fix logic to return to room 304

Changed paths:
    engines/m4/riddle/rooms/section3/room303.cpp


diff --git a/engines/m4/riddle/rooms/section3/room303.cpp b/engines/m4/riddle/rooms/section3/room303.cpp
index 7505d4f0413..ec3c1490e80 100644
--- a/engines/m4/riddle/rooms/section3/room303.cpp
+++ b/engines/m4/riddle/rooms/section3/room303.cpp
@@ -1548,6 +1548,14 @@ void Room303::parser() {
 					_G(player_info).scale, _G(player_info).depth, 7, 1);
 				break;
 
+			case 1:
+				terminateMachine(_door);
+				series_plain_play("DOOR", 1, 0, 100, 3845, 7, 2, false);
+				digi_play("303_s01", 1, 255, -1, -1);
+				_med1 = series_load("SUIT DOOR OPENER POS1", -1, nullptr);
+				series_play_xy("SUIT DOOR OPENER POS1", 1, 2, _G(player_info).x, _G(player_info).y, _G(player_info).scale, _G(player_info).depth, 7, 3);
+				break;
+				
 			case 2:
 				series_show_sprite("DOOR", 7, 0xf05);
 				break;
@@ -1559,7 +1567,7 @@ void Room303::parser() {
 				break;
 
 			case 4:
-				ws_walk(417, 232, nullptr, -1, 2);
+				ws_walk(417, 232, nullptr, -1, 2, true);
 				disable_player_commands_and_fade_init(6);
 				break;
 


Commit: 62da6d657cc1d56b1cb77905ab895b22ffb35b10
    https://github.com/scummvm/scummvm/commit/62da6d657cc1d56b1cb77905ab895b22ffb35b10
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-20T11:28:18+01:00

Commit Message:
GOT: Revert accidental change in f0bb3d51fad47c82a3fd24fe5f36b9778d8664c5

Changed paths:
    engines/got/sound.cpp


diff --git a/engines/got/sound.cpp b/engines/got/sound.cpp
index 66d2b10d9a4..4caaa9f5dbb 100644
--- a/engines/got/sound.cpp
+++ b/engines/got/sound.cpp
@@ -129,31 +129,14 @@ void Sound::musicPlay(const char *name, bool override) {
 		File file(name);
 
 #ifdef TODO
-		// Just a POC + Not working - No volume, maybe?
+		// FIXME: Completely wrong. Don't know music format yet
+		// Open it up for access
+		Common::SeekableReadStream *f = file.readStream(file.size());
+		Audio::AudioStream *audioStream = Audio::makeRawStream(
+			f, 11025, 0, DisposeAfterUse::YES);
+		g_engine->_mixer->playStream(Audio::Mixer::kPlainSoundType,
+									 &_musicHandle, audioStream);
 
-		OPL::OPL *opl = OPL::Config::create();
-		opl->init();
-		opl->start()
-		const int startLoop = file.readUint16LE();
-
-		while (!file.eos()) {
-			int delayAfter = file.readByte();
-			if (delayAfter & 0x80)
-				delayAfter = ((delayAfter & 0x7f) << 8) | file.readByte();
-
-			const int reg = file.readByte();
-			const int value = file.readByte();
-			if (reg == 0 && value == 0) {
-				debug(1, "End of song");
-				break;
-			}
-
-			opl->writeReg(reg, value);
-			debug("DelayAfter %d, OPL reg 0x%X, value %d", delayAfter, reg, value);
-			g_engine->_system->delayMillis(delayAfter);
-		}
-		debug(1, "looping at pos %d", startLoop);
-		
 #else
 		warning("TODO: play_music %s", name);