Commit c745925
fix mainhall music continuing to play during mission loop brief
When a player enters the mission loop screen from the main hall, there was no code to handle the stopping of main hall music and ambient sound. Add code to handle this specific case.
Also fix `Loop_sound` not being initialized to -1 `in loop_brief_init()`, which caused an assert when closing the loop brief screen if no branch brief sound was defined for the mission.
Fixes scp-fs2open#7330.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent cc26887 commit c745925
2 files changed
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
| |||
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
130 | 133 | | |
131 | 134 | | |
132 | 135 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6293 | 6293 | | |
6294 | 6294 | | |
6295 | 6295 | | |
| 6296 | + | |
| 6297 | + | |
| 6298 | + | |
| 6299 | + | |
6296 | 6300 | | |
6297 | 6301 | | |
6298 | 6302 | | |
| |||
0 commit comments