diff --git a/Core/BaseRenderer.cpp b/Core/BaseRenderer.cpp index 9adaf790..34aeb737 100644 --- a/Core/BaseRenderer.cpp +++ b/Core/BaseRenderer.cpp @@ -132,7 +132,7 @@ void BaseRenderer::ShowGameTimer(int lineNumber) { int yPos = 13 + 24 * lineNumber; double frameCount = PPU::GetFrameCount(); - double frameRate = Console::GetNesModel() == NesModel::NTSC ? 60.098811862348404716732985230828 : 50.006977968268290848936010226333; + double frameRate = Console::GetModel() == NesModel::NTSC ? 60.098811862348404716732985230828 : 50.006977968268290848936010226333; //uint32_t milliseconds = (uint32_t)(frameCount / 60.1 * 1000) % 1000; uint32_t seconds = (uint32_t)(frameCount / frameRate) % 60; uint32_t minutes = (uint32_t)(frameCount / frameRate / 60) % 60; diff --git a/Core/Console.cpp b/Core/Console.cpp index 7d91eace..0ec68d4f 100644 --- a/Core/Console.cpp +++ b/Core/Console.cpp @@ -610,11 +610,6 @@ void Console::RequestReset() Instance->_resetRequested = true; } -NesModel Console::GetNesModel() -{ - return Instance->_model; -} - uint32_t Console::GetLagCounter() { return Instance->_lagCounter; diff --git a/Core/Console.h b/Core/Console.h index b8b5a076..a5080b12 100644 --- a/Core/Console.h +++ b/Core/Console.h @@ -82,7 +82,6 @@ class Console std::shared_ptr GetDebugger(bool autoStart = true); void StopDebugger(); - static NesModel GetNesModel(); static void SaveState(ostream &saveStream); static void LoadState(istream &loadStream); static void LoadState(uint8_t *buffer, uint32_t bufferSize); diff --git a/Core/ControlManager.cpp b/Core/ControlManager.cpp index eb4f8069..bc6090af 100644 --- a/Core/ControlManager.cpp +++ b/Core/ControlManager.cpp @@ -284,7 +284,7 @@ void ControlManager::StreamState(bool saving) bool hasFourScore = false; bool useNes101Hvc101Behavior = false; if(saving) { - nesModel = Console::GetNesModel(); + nesModel = Console::GetModel(); expansionDevice = EmulationSettings::GetExpansionDevice(); consoleType = EmulationSettings::GetConsoleType(); hasFourScore = EmulationSettings::CheckFlag(EmulationFlags::HasFourScore); diff --git a/Core/MesenMovie.cpp b/Core/MesenMovie.cpp index 8f21d34a..cc9b9155 100644 --- a/Core/MesenMovie.cpp +++ b/Core/MesenMovie.cpp @@ -175,7 +175,7 @@ bool MesenMovie::Save() header.MovieFormatVersion = MesenMovie::MovieFormatVersion; header.SaveStateFormatVersion = SaveStateManager::FileFormatVersion; header.RomCrc32 = Console::GetCrc32(); - header.Region = (uint32_t)Console::GetNesModel(); + header.Region = (uint32_t)Console::GetModel(); header.ConsoleType = (uint32_t)EmulationSettings::GetConsoleType(); header.ExpansionDevice = (uint32_t)EmulationSettings::GetExpansionDevice(); header.OverclockRate = (uint32_t)EmulationSettings::GetOverclockRate(); diff --git a/Core/TraceLogger.cpp b/Core/TraceLogger.cpp index 728258ef..9b7610d3 100644 --- a/Core/TraceLogger.cpp +++ b/Core/TraceLogger.cpp @@ -99,7 +99,7 @@ void TraceLogger::GetTraceRow(string &output, State &cpuState, PPUDebugState &pp ppuCycle = 341 + ppuCycle; scanline--; if(scanline < -1) { - scanline = EmulationSettings::GetNesModel() == NesModel::NTSC ? 260 : 310; + scanline = Console::GetModel() == NesModel::NTSC ? 260 : 310; } }