ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Handle masking of random in CSystemTimer::UpdateTimers

This commit is contained in:
zilmar 2022-11-14 11:19:02 +10:30
parent 02660c2f62
commit cabcd2cc95
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Project64-core/N64System/Mips/SystemTiming.cpp
View File

@ -165,19 +165,24 @@ void CSystemTimer::UpdateTimers()
m_Reg.COUNT_REGISTER += TimeTaken; m_Reg.COUNT_REGISTER += TimeTaken;
random = (uint32_t)m_Reg.RANDOM_REGISTER - ((TimeTaken * CGameSettings::OverClockModifier()) / m_System.CountPerOp()); random = (uint32_t)m_Reg.RANDOM_REGISTER - ((TimeTaken * CGameSettings::OverClockModifier()) / m_System.CountPerOp());
wired = (uint32_t)m_Reg.WIRED_REGISTER; wired = (uint32_t)m_Reg.WIRED_REGISTER;
if (random < wired) if (wired > 31)
{ {
if (wired == 0) if (random <= wired)
{ {
random &= 31; uint32_t increment = 64;
random += ((wired - random + increment - 1) / increment) * increment;
}
m_Reg.RANDOM_REGISTER = random & 0x3F;
} }
else else
{ {
uint32_t increment = 32 - wired; if (random <= wired)
{
uint32_t increment = wired != 32 ? (32 - wired) : 1;
random += ((wired - random + increment - 1) / increment) * increment; random += ((wired - random + increment - 1) / increment) * increment;
} }
m_Reg.RANDOM_REGISTER = random & 0x1F;
} }
m_Reg.RANDOM_REGISTER = random;
} }
} }