diff --git a/Source/Project64-core/N64System/N64Class.h b/Source/Project64-core/N64System/N64Class.h index 216e75046..039567fbd 100644 --- a/Source/Project64-core/N64System/N64Class.h +++ b/Source/Project64-core/N64System/N64Class.h @@ -147,7 +147,7 @@ private: CProfiling m_CPU_Usage; //used to track the cpu usage CRecompiler * m_Recomp; CAudio m_Audio; - CSpeedLimitor m_Limitor; + CSpeedLimiter m_Limitor; bool m_InReset; int32_t m_NextTimer; CSystemTimer m_SystemTimer; diff --git a/Source/Project64-core/N64System/SpeedLimiterClass.cpp b/Source/Project64-core/N64System/SpeedLimiterClass.cpp index 2c72585f9..79921e15b 100644 --- a/Source/Project64-core/N64System/SpeedLimiterClass.cpp +++ b/Source/Project64-core/N64System/SpeedLimiterClass.cpp @@ -16,7 +16,7 @@ #pragma comment(lib, "winmm.lib") -CSpeedLimitor::CSpeedLimitor() +CSpeedLimiter::CSpeedLimiter() { m_Frames = 0; m_LastTime = 0; @@ -32,28 +32,28 @@ CSpeedLimitor::CSpeedLimitor() } } -CSpeedLimitor::~CSpeedLimitor() +CSpeedLimiter::~CSpeedLimiter() { TIMECAPS Caps; timeGetDevCaps(&Caps, sizeof(Caps)); timeEndPeriod(Caps.wPeriodMin); } -void CSpeedLimitor::SetHertz(uint32_t Hertz) +void CSpeedLimiter::SetHertz(uint32_t Hertz) { m_Speed = Hertz; m_BaseSpeed = Hertz; FixSpeedRatio(); } -void CSpeedLimitor::FixSpeedRatio() +void CSpeedLimiter::FixSpeedRatio() { m_Ratio = 1000.0f / static_cast(m_Speed); m_Frames = 0; m_LastTime = timeGetTime(); } -bool CSpeedLimitor::Timer_Process(uint32_t * FrameRate) +bool CSpeedLimiter::Timer_Process(uint32_t * FrameRate) { m_Frames += 1; uint32_t CurrentTime = timeGetTime(); @@ -87,7 +87,7 @@ bool CSpeedLimitor::Timer_Process(uint32_t * FrameRate) } } -void CSpeedLimitor::IncreaseSpeed() +void CSpeedLimiter::IncreaseSpeed() { if (m_Speed >= 60) { @@ -105,7 +105,7 @@ void CSpeedLimitor::IncreaseSpeed() FixSpeedRatio(); } -void CSpeedLimitor::DecreaseSpeed() +void CSpeedLimiter::DecreaseSpeed() { if (m_Speed > 60) { diff --git a/Source/Project64-core/N64System/SpeedLimiterClass.h b/Source/Project64-core/N64System/SpeedLimiterClass.h index df2931680..e7bae1978 100644 --- a/Source/Project64-core/N64System/SpeedLimiterClass.h +++ b/Source/Project64-core/N64System/SpeedLimiterClass.h @@ -12,12 +12,12 @@ #include "../Settings/GameSettings.h" -class CSpeedLimitor : +class CSpeedLimiter : private CGameSettings { public: - CSpeedLimitor(); - ~CSpeedLimitor(); + CSpeedLimiter(); + ~CSpeedLimiter(); void SetHertz(const uint32_t Hertz); bool Timer_Process(uint32_t* const FrameRate); @@ -25,8 +25,8 @@ public: void DecreaseSpeed(); private: - CSpeedLimitor(const CSpeedLimitor&); // Disable copy constructor - CSpeedLimitor& operator=(const CSpeedLimitor&); // Disable assignment + CSpeedLimiter(const CSpeedLimiter&); // Disable copy constructor + CSpeedLimiter& operator=(const CSpeedLimiter&); // Disable assignment void FixSpeedRatio();