libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2024-11-23 09:09:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2022-04-03 21:57:05 +02:00
parent 8ddedbb5b8
commit 1ac829ab5c
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Core/Console.cpp
View File

@ -13,7 +13,6 @@
#include "Debugger.h"
#include "MessageManager.h"
#include "EmulationSettings.h"
#include "../Utilities/sha1.h"
#include "../Utilities/Timer.h"
#include "../Utilities/FolderUtilities.h"
#include "VirtualFile.h"
@ -537,7 +536,10 @@ void Console::ReloadRom(bool forPowerCycle)
void Console::Reset(bool softReset)
{
if(_initialized) {
bool needSuspend = softReset ? _systemActionManager->Reset() : _systemActionManager->PowerCycle();
if (softReset)
_systemActionManager->Reset();
else
_systemActionManager->PowerCycle();
}
}
@ -860,13 +862,6 @@ double Console::GetFrameDelay()
return frameDelay;
}
double Console::GetFps()
{
if(_model == NesModel::NTSC)
return _settings->CheckFlag(EmulationFlags::IntegerFpsMode) ? 60.0 : 60.098812;
return _settings->CheckFlag(EmulationFlags::IntegerFpsMode) ? 50.0 : 50.006978;
}
void Console::SaveState(ostream &saveStream)
{
if(_initialized) {
@ -945,21 +940,11 @@ void Console::ResetLagCounter()
Resume();
}
bool Console::IsDebuggerAttached()
{
return false;
}
void Console::SetNextFrameOverclockStatus(bool disabled)
{
_disableOcNextFrame = disabled;
}
int32_t Console::GetStopCode()
{
return _stopCode;
}
void Console::InitializeRam(void* data, uint32_t length)
{
InitializeRam(_settings->GetRamPowerOnState(), data, length);

6
Core/Console.h
View File

@ -145,8 +145,6 @@ public:
void ResetRunTimers();
void Stop(int stopCode = 0);
int32_t GetStopCode();
void RunSingleFrame();
void RunSlaveCpu();
bool UpdateHdPackMode();
@ -202,10 +200,6 @@ public:
void SetNextFrameOverclockStatus(bool disabled);
bool IsDebuggerAttached();
double GetFps();
void InitializeRam(void* data, uint32_t length);
static void InitializeRam(RamPowerOnState powerOnState, void* data, uint32_t length);