Game-Decompilation/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-11-23 14:20:07 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

g/j2: workaround intermittent lifeseed DMA crash (#3418)

Browse Source 
This is not a fix, but it temporarily works around the potential crash
discussed here https://github.com/open-goal/jak-project/issues/2988

As long as this doesn't impact other things, this feels like a good
interim fix, as having a broken cutscene is better than a fatal crash
and it might be some time before this is properly identified and fixed.
This commit is contained in:
Tyler Wilding 2024-03-09 19:31:00 -05:00 committed by GitHub
parent d9d09a8bc2
commit 937af7984f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
game/overlord/jak2/dma.cpp
View File

@ -1,5 +1,8 @@
#include "dma.h"
#include "common/log/log.h"
#include "common/util/string_util.h"
#include "game/overlord/jak2/ssound.h"
#include "game/overlord/jak2/vag.h"
#include "game/sound/sdshim.h"
@ -69,6 +72,14 @@ int SpuDmaIntr(int, void*) {
// start the transfer!
pending_dma = kDmaDelay;
// TODO - temporary hack, `channel` being set to -1 is what causes the lifeseed cutscene crash
// narrow down why/where -1 is coming from
// - https://github.com/open-goal/jak-project/issues/2988
if (chan < 0) {
lg::error("SND-ERROR: channel was invalid: {} for command: {}", chan,
DmaStereoVagCmd->name);
return -1;
}
sceSdVoiceTrans((int)chan, 0, iop_ptr, spu_addr, old_xfer);
// and return. This will get called again on completion
return 0;