X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=cd99842b6bf36357f659d72ee76c0128754f8c70;hp=6f82abd5ae3baf3ae7e73ae05a35f9656d394354;hb=cec398c037bc9c9ec9010dcbed04f2c3ae7d2c61;hpb=24de2dd4dbdd50e44c91c40ebbc7d59ee1c0ac9b

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 6f82abd5..cd99842b 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -190,20 +190,16 @@ void psxRcntReset( u32 index )
 {
     u32 count;
 
+    rcnts[index].mode |= RcUnknown10;
+
     if( rcnts[index].counterState == CountToTarget )
     {
+        count  = psxRegs.cycle;
+        count -= rcnts[index].cycleStart;
+        if( rcnts[index].rate > 1 )
+            count /= rcnts[index].rate;
         if( rcnts[index].mode & RcCountToTarget )
-        {
-            count  = psxRegs.cycle;
-            count -= rcnts[index].cycleStart;
-            if (rcnts[index].rate > 1)
-                count /= rcnts[index].rate;
             count -= rcnts[index].target;
-        }
-        else
-        {
-            count = _psxRcntRcount( index );
-        }
 
         _psxRcntWcount( index, count );
 
@@ -218,8 +214,12 @@ void psxRcntReset( u32 index )
         }
 
         rcnts[index].mode |= RcCountEqTarget;
+
+        if( count < 0xffff ) // special case, overflow too?
+            return;
     }
-    else if( rcnts[index].counterState == CountToOverflow )
+
+    if( rcnts[index].counterState == CountToOverflow )
     {
         count  = psxRegs.cycle;
         count -= rcnts[index].cycleStart;
@@ -241,10 +241,6 @@ void psxRcntReset( u32 index )
 
         rcnts[index].mode |= RcOverflow;
     }
-
-    rcnts[index].mode |= RcUnknown10;
-
-    psxRcntSet();
 }
 
 void psxRcntUpdate()
@@ -294,11 +290,13 @@ void psxRcntUpdate()
         // VSync irq.
         if( hSyncCount == VBlankStart[Config.PsxType] )
         {
-            //if( !(HW_GPU_STATUS & PSXGPU_ILACE) ) // hmh
+            if( !(HW_GPU_STATUS & PSXGPU_ILACE) )
                 HW_GPU_STATUS |= PSXGPU_LCF;
 
-            // For the best times. :D
-            //setIrq( 0x01 );
+            setIrq( 0x01 );
+
+            EmuUpdate();
+            GPU_updateLace();
         }
         
         // Update lace. (with InuYasha fix)
@@ -307,11 +305,6 @@ void psxRcntUpdate()
             hSyncCount = 0;
             frame_counter++;
 
-            setIrq( 0x01 );
-
-            EmuUpdate();
-            GPU_updateLace();
-
             HW_GPU_STATUS &= ~PSXGPU_LCF;
             if( HW_GPU_STATUS & PSXGPU_ILACE )
                 HW_GPU_STATUS |= frame_counter << 31;
@@ -335,9 +328,10 @@ void psxRcntUpdate()
                 base_cycle += hsync_steps * 8791293;
         rcnts[3].cycle = base_cycle >> 12;
         base_cycle &= 0xfff;
-        psxRcntSet();
     }
 
+    psxRcntSet();
+
 #ifndef NDEBUG
     DebugVSync();
 #endif