Fixes Diablo 1 SPU bug properly and remove Diablo hack. (#191)

[pcsx_rearmed.git] / plugins / dfsound / registers.c

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 91bcaf8..cc72020 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -112,6 +112,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
      //------------------------------------------------//\r
      case 14:                                          // loop?\r
        spu.s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);\r
+       spu.s_chan[ch].bIgnoreLoop = 1;\r
        goto upd_irq;\r
      //------------------------------------------------//\r
     }\r
@@ -315,7 +316,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      return spu.spuCtrl;\r
 \r
     case H_SPUstat:\r
-     return spu.spuStat;\r
+     return (spu.spuStat & ~0x3F) | (spu.spuCtrl & 0x3F);\r
         \r
     case H_SPUaddr:\r
      return (unsigned short)(spu.spuAddr>>3);\r
@@ -351,8 +352,7 @@ static void SoundOn(int start,int end,unsigned short val)
   {\r
    if((val&1) && regAreaGet(ch,6))                     // mmm... start has to be set before key on !?!\r
     {\r
-     spu.s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned\r
-     spu.s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);\r
+     spu.s_chan[ch].bIgnoreLoop = 0;\r
      spu.dwNewChannel|=(1<<ch);\r
     }\r
   }\r