github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 04:50:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash on mac with custom sequences (#2226)

Browse source
This commit is contained in:
Garrett Cox 2022-12-21 02:04:11 -06:00 • committed by GitHub
commit 0e7a89d117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
soh/src/code/code_800F9280.c
View file

@ -8,6 +8,8 @@ typedef struct {
u8 unk_1; // importance? u8 unk_1; // importance?
} Struct_8016E320; } Struct_8016E320;
#define GET_PLAYER_IDX(cmd) (cmd & 0xF000000) >> 24
Struct_8016E320 D_8016E320[4][5]; Struct_8016E320 D_8016E320[4][5];
u8 D_8016E348[4]; u8 D_8016E348[4];
u32 sAudioSeqCmds[0x100]; u32 sAudioSeqCmds[0x100];
@ -122,7 +124,7 @@ void Audio_ProcessSeqCmd(u32 cmd) {
} }
op = cmd >> 28; op = cmd >> 28;
playerIdx = (cmd & 0xF000000) >> 24; playerIdx = GET_PLAYER_IDX(cmd);
switch (op) { switch (op) {
case 0x0: case 0x0:
@ -371,12 +373,12 @@ void Audio_QueueSeqCmd(u32 cmd)
u8 op = cmd >> 28; u8 op = cmd >> 28;
if (op == 0 || op == 2 || op == 12) { if (op == 0 || op == 2 || op == 12) {
u8 seqId = cmd & 0xFF; u8 seqId = cmd & 0xFF;
u8 playerIdx = (cmd >> 24) & 0xFF; u8 playerIdx = GET_PLAYER_IDX(cmd);
u16 newSeqId = SfxEditor_GetReplacementSeq(seqId); u16 newSeqId = SfxEditor_GetReplacementSeq(seqId);
gAudioContext.seqReplaced[playerIdx] = (seqId != newSeqId); gAudioContext.seqReplaced[playerIdx] = (seqId != newSeqId);
gAudioContext.seqToPlay[playerIdx] = newSeqId; gAudioContext.seqToPlay[playerIdx] = newSeqId;
cmd |= (seqId & 0xFF); cmd |= (seqId & 0xFF);
} }
sAudioSeqCmds[sSeqCmdWrPos++] = cmd; sAudioSeqCmds[sSeqCmdWrPos++] = cmd;
} }