summaryrefslogtreecommitdiff
path: root/libpcsxcore
diff options
context:
space:
mode:
authorSND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-10-04 23:51:33 +0000
committerSND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-10-04 23:51:33 +0000
commit449489239322b89c5335eb936a67ec56693002bc (patch)
treeb3fa58864d3522596cbcd14d2d8302834e276c99 /libpcsxcore
parent023a156a0e89eb3452ddfa492b152b1d7ec983f3 (diff)
downloadpcsxr-449489239322b89c5335eb936a67ec56693002bc.tar.gz
Firemen 2: cdrom.c
- ADPCM playing without channel filtering Fixes cutscene, briefing voices / music git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@58090 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore')
-rw-r--r--libpcsxcore/cdrom.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5e7061e3..e3f0e68c 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -827,6 +827,11 @@ void cdrReadInterrupt() {
#endif
if ((!cdr.Muted) && (cdr.Mode & 0x40) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
+ // Firemen 2: Multi-XA files - briefings, cutscenes
+ if( cdr.FirstSector == 1 && (cdr.Mode & 0x8)==0 ) {
+ cdr.File = cdr.Transfer[4 + 0];
+ }
+
if ((cdr.Transfer[4 + 2] & 0x4) &&
((cdr.Mode & 0x8) ? (cdr.Transfer[4 + 1] == cdr.Channel) : 1) &&
(cdr.Transfer[4 + 0] == cdr.File)) {