diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-11-22 15:13:30 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-11-22 15:13:30 +0000 |
| commit | 2bf2101b07bb0722504ba58173cc618644758bb0 (patch) | |
| tree | e476848aae047cd863e967d746c90dcdee8a567d | |
| parent | 959fe620c6f7609ace07b4821df535faa3763377 (diff) | |
| download | pcsxr-2bf2101b07bb0722504ba58173cc618644758bb0.tar.gz | |
Space Hulk - Vengeance of the Blood Angels - cdrom.c
- channel off = use first file
- fix music, speech
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@59955 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | libpcsxcore/cdrom.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 96d9faac..325e3866 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -1360,14 +1360,15 @@ void cdrReadInterrupt() { 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)) { - int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector); + if( cdr.FirstSector == 1 && (cdr.Mode & 0x8)==0 ) {
+ cdr.File = cdr.Transfer[4 + 0];
+ cdr.Channel = cdr.Transfer[4 + 1];
+ }
+
+ if((cdr.Transfer[4 + 2] & 0x4) &&
+ (cdr.Transfer[4 + 1] == cdr.Channel) &&
+ (cdr.Transfer[4 + 0] == cdr.File)) {
+ int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
if (!ret) { SPU_playADPCMchannel(&cdr.Xa); |