diff --git a/Source/PS2OS.cpp b/Source/PS2OS.cpp index a2d8d357..86e7d315 100644 --- a/Source/PS2OS.cpp +++ b/Source/PS2OS.cpp @@ -933,7 +933,7 @@ uint32 CPS2OS::GetNextReadyThread() CRoundRibbon::ITERATOR itThread(m_pThreadSchedule); THREAD* pThread; unsigned int nID; - +/* unsigned int nRand, nCount; srand((unsigned int)time(NULL)); nRand = rand(); @@ -981,7 +981,8 @@ uint32 CPS2OS::GetNextReadyThread() } return nID; -/* +*/ + for(itThread = m_pThreadSchedule->Begin(); !itThread.IsEnd(); itThread++) { nID = itThread.GetValue(); @@ -1002,7 +1003,7 @@ uint32 CPS2OS::GetNextReadyThread() m_pThreadSchedule->Insert(nID, pThread->nPriority); return nID; -*/ + } void CPS2OS::CreateWaitThread() @@ -2007,6 +2008,9 @@ void CPS2OS::sc_SifSetDma() m_pCtx->m_State.nGPR[SC_RETURN].nV[0] = nCount; m_pCtx->m_State.nGPR[SC_RETURN].nV[1] = 0; + //Force reschedule + ElectThread(GetNextReadyThread()); + for(i = 0; i < nCount; i++) { nSize = (pXfer[i].nSize + 0x0F) / 0x10; @@ -2016,9 +2020,6 @@ void CPS2OS::sc_SifSetDma() CDMAC::SetRegister(CDMAC::D6_QWC, nSize); CDMAC::SetRegister(CDMAC::D6_CHCR, 0x00000100); } - - //Force reschedule - ElectThread(GetNextReadyThread()); } //78 diff --git a/Source/win32ui/GSH_OpenGL.cpp b/Source/win32ui/GSH_OpenGL.cpp index af396bb4..ca652bac 100644 --- a/Source/win32ui/GSH_OpenGL.cpp +++ b/Source/win32ui/GSH_OpenGL.cpp @@ -1005,14 +1005,14 @@ void CGSH_OpenGL::WriteRegister(uint8 nRegister, uint64 nData) case GS_REG_FOGCOL: SetupFogColor(); break; -/* + //Atelier Iris //Ys 1 & 2 : Eternal Story case GS_REG_FRAME_1: Flip(); break; -*/ +/* //Castlevania: CoD case GS_REG_FRAME_1: case GS_REG_FRAME_2: @@ -1035,7 +1035,7 @@ void CGSH_OpenGL::WriteRegister(uint8 nRegister, uint64 nData) } } break; - +*/ } } diff --git a/patches.xml b/patches.xml index 7faea9cf..f45d7be6 100644 --- a/patches.xml +++ b/patches.xml @@ -5,6 +5,7 @@ +