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

s/m_Limitor/m_Limiter

This commit is contained in:
2015-12-14 17:10:30 -05:00
parent df83c3c440
commit 32aefd4b10
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64-core/N64System/N64Class.cpp
View File

@ -61,7 +61,7 @@ m_CheatsSlectionChanged(false)
{
gameHertz = (SystemType() == SYSTEM_PAL) ? 50 : 60;
}
m_Limitor.SetHertz(gameHertz);
m_Limiter.SetHertz(gameHertz);
g_Settings->SaveDword(GameRunning_ScreenHertz, gameHertz);
m_Cheats.LoadCheats(!g_Settings->LoadDword(Setting_RememberCheats), Plugins);
}
@ -1868,7 +1868,7 @@ void CN64System::RefreshScreen()
{
if (bShowCPUPer()) { m_CPU_Usage.StartTimer(Timer_Idel); }
uint32_t FrameRate;
if (m_Limitor.Timer_Process(&FrameRate) && bDisplayFrameRate())
if (m_Limiter.Timer_Process(&FrameRate) && bDisplayFrameRate())
{
m_FPS.DisplayViCounter(FrameRate);
m_bCleanFrameBox = true;

6
Source/Project64-core/N64System/N64Class.h
View File

@ -64,8 +64,8 @@ public:
void ExternalEvent(SystemEvent action); //covers gui interacting and timers etc..
void StartEmulation(bool NewThread);
void SyncToAudio();
void IncreaseSpeed() { m_Limitor.IncreaseSpeed(); }
void DecreaseSpeed() { m_Limitor.DecreaseSpeed(); }
void IncreaseSpeed() { m_Limiter.IncreaseSpeed(); }
void DecreaseSpeed() { m_Limiter.DecreaseSpeed(); }
void Reset(bool bInitReg, bool ClearMenory);
void GameReset();
void PluginReset();
@ -147,7 +147,7 @@ private:
CProfiling m_CPU_Usage; //used to track the cpu usage
CRecompiler * m_Recomp;
CAudio m_Audio;
CSpeedLimiter m_Limitor;
CSpeedLimiter m_Limiter;
bool m_InReset;
int32_t m_NextTimer;
CSystemTimer m_SystemTimer;