[Scummvm-git-logs] scummvm master -> 7a4c40ec2ec25e3f59fd8362acc14c8556d2493d
dreammaster
noreply at scummvm.org
Fri Jul 24 05:54:30 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
a12748c9b1 MADS: NEBULAR: Add missing random quote in room 102
7a4c40ec2e MADS: NEBULAR: Cleanup of ASound8
Commit: a12748c9b1a49c5b722846f052f92ab2989b5ac6
https://github.com/scummvm/scummvm/commit/a12748c9b1a49c5b722846f052f92ab2989b5ac6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-24T15:54:24+10:00
Commit Message:
MADS: NEBULAR: Add missing random quote in room 102
Changed paths:
engines/mads/nebular/rooms/room102.cpp
diff --git a/engines/mads/nebular/rooms/room102.cpp b/engines/mads/nebular/rooms/room102.cpp
index ce1d452127f..aeaeb996949 100644
--- a/engines/mads/nebular/rooms/room102.cpp
+++ b/engines/mads/nebular/rooms/room102.cpp
@@ -121,7 +121,7 @@ static void room_102_init() {
local._chairDescrFl = false;
local._activeMsgFl = false;
- _game.loadQuoteSet(0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x45, 0x43, 0);
+ _game.loadQuoteSet(0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0);
if (_scene->_priorSceneId == 101)
_vm->_sound->command(20);
Commit: 7a4c40ec2ec25e3f59fd8362acc14c8556d2493d
https://github.com/scummvm/scummvm/commit/7a4c40ec2ec25e3f59fd8362acc14c8556d2493d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-07-24T15:54:24+10:00
Commit Message:
MADS: NEBULAR: Cleanup of ASound8
Changed paths:
engines/mads/nebular/asound.cpp
engines/mads/nebular/sound_nebular.cpp
diff --git a/engines/mads/nebular/asound.cpp b/engines/mads/nebular/asound.cpp
index b560e33bcb0..8affba13ce7 100644
--- a/engines/mads/nebular/asound.cpp
+++ b/engines/mads/nebular/asound.cpp
@@ -290,7 +290,7 @@ void ASound::playSoundData(byte *pData, int startingChannel) {
}
bool ASound::isSoundActive(byte *pData) {
- for (int i = 0; i < ADLIB_CHANNEL_MIDWAY; ++i) {
+ for (int i = 0; i <= ADLIB_CHANNEL_MIDWAY; ++i) {
if (_channels[i]._activeCount && _channels[i]._soundData == pData)
return true;
}
diff --git a/engines/mads/nebular/sound_nebular.cpp b/engines/mads/nebular/sound_nebular.cpp
index b215a4d5907..9f5d7f2b925 100644
--- a/engines/mads/nebular/sound_nebular.cpp
+++ b/engines/mads/nebular/sound_nebular.cpp
@@ -2211,7 +2211,7 @@ const ASound8::CommandPtr ASound8::_commandList[38] = {
&ASound8::command4, &ASound8::command5, &ASound8::command6, &ASound8::command7,
&ASound8::command8, &ASound8::command9, &ASound8::command10, &ASound8::command11,
&ASound8::command12, &ASound8::command13, &ASound8::command14, &ASound8::command15,
- &ASound8::command16, &ASound8::command16, &ASound8::command18, &ASound8::command19,
+ &ASound8::command16, &ASound8::command17, &ASound8::command18, &ASound8::command19,
&ASound8::command20, &ASound8::command21, &ASound8::command22, &ASound8::command23,
&ASound8::command24, &ASound8::command25, &ASound8::command26, &ASound8::command27,
&ASound8::command28, &ASound8::command29, &ASound8::command30, &ASound8::command31,
More information about the Scummvm-git-logs
mailing list