falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ocarina start UB for Japas jam session (#1742)

This commit is contained in:
Archez 2024-11-17 10:55:53 -05:00 committed by GitHub
parent 4663beda1a
commit a198b8556b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/code/z_message.c
View File

@ -4338,7 +4338,10 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) {
if ((msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF) || if ((msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF) ||
(msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART2_SECOND_HALF)) { (msgCtx->ocarinaAction == OCARINA_ACTION_PROMPT_EVAN_PART2_SECOND_HALF)) {
AudioOcarina_StartForSongCheck( AudioOcarina_StartForSongCheck(
(1 << (OCARINA_ACTION_PROMPT_SONATA + msgCtx->ocarinaAction)) | 0x80000000, 4); (1 << ((msgCtx->ocarinaAction - OCARINA_ACTION_PROMPT_EVAN_PART1_SECOND_HALF) +
OCARINA_SONG_EVAN_PART1)) |
0x80000000,
4);
msgCtx->msgMode = MSGMODE_SONG_PROMPT; msgCtx->msgMode = MSGMODE_SONG_PROMPT;
} else { } else {
if ((msgCtx->ocarinaAction >= OCARINA_ACTION_PROMPT_WIND_FISH_HUMAN) && if ((msgCtx->ocarinaAction >= OCARINA_ACTION_PROMPT_WIND_FISH_HUMAN) &&