Fix original cutscene music lifecycle and verify walking lab route
This commit is contained in:
1 parent
c929f942e1
commit
b58138d7ba
16 files changed
+282
-18
No files matched your search
@@ -43,3 +43,30 @@ output in Original. Managed merge tests reject conflicting identities. The SDL
|
||||
dummy-device --effects-audio-smoke consumes original58/59 streams, retains a
|
||||
one-shot while stopping the loop, adds230 independently and clears all streams.
|
||||
No physical speaker, original timing/position or native Windows audio claim follows.
|
||||
|
||||
|
||||
## Cutscene music correction from user testing
|
||||
|
||||
The user reported music continuing during cutscenes in the packaged build.
|
||||
The prior consumer always looped STRT music underneath all speech. Original CAM
|
||||
activation416776..4167E1 explicitly checks current music database696004, obtains
|
||||
Jimmy complete+0xA38 handle, calls47D7A0(handle,0), unloads his selected music
|
||||
archive+0xA4C and clears696004. This happens before the new speech starts.
|
||||
DEFAULT447D5C returns early if Jimmy already controls the player; otherwise
|
||||
447F12..447F45 reloads his selected music and starts it again (source wave0).
|
||||
|
||||
SceneDirector now emits MusicStopped before an actual CAM speech and MusicRestarted
|
||||
when DEFAULT returns control from a sequence. SceneAudio disposes the music stream
|
||||
on stop and restarts the selected track on return; this is a restart, not a silent
|
||||
advancing/resumed loop. Speech, effects and source scene actions remain separate.
|
||||
The lab chain begins with CAM, so music stays stopped through its intervening MCA
|
||||
shots until DEFAULT. A standalone MCA has its own source path431280; a universal
|
||||
mute-on-any-speech rule is not established and has not been invented.
|
||||
|
||||
Seven exact EXE instruction checks guard the stop/restart sites. Director tests
|
||||
check stop-before-speech, silence between chained shots, one natural restart,
|
||||
no repeat restart with Jimmy already controlled, and skip restoration. The SDL
|
||||
dummy --cutscene-audio-smoke runs the actual16-cue lab chain against original audio
|
||||
resources and verifies zero queued music throughout, natural restart, reset silence
|
||||
and skip restart. It passes. This fixes the implemented lab music lifecycle;
|
||||
physical output/native Windows comparison remains user/runtime validation work.
|
||||
Reference in new issue
Block a user