Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3447 from thedax/master

Browse Source 
Cleanup: Remove some unused options, and move some out of the "These are broken" section.
This commit is contained in:
Henrik Rydgård 2013-08-27 14:42:47 -07:00
commit 5002979fc6
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/Config.cpp
View File

@ -48,13 +48,10 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
IniFile::Section *general = iniFile.GetOrCreateSection("General");
bSpeedLimit = false;
general->Get("FirstRun", &bFirstRun, true);
general->Get("Enable Logging", &bEnableLogging, true);
general->Get("AutoLoadLast", &bAutoLoadLast, false);
general->Get("AutoRun", &bAutoRun, true);
general->Get("Browse", &bBrowse, false);
general->Get("ConfirmOnQuit", &bConfirmOnQuit, false);
general->Get("IgnoreBadMemAccess", &bIgnoreBadMemAccess, true);
general->Get("CurrentDirectory", &currentDirectory, "");
general->Get("ShowDebuggerOnLoad", &bShowDebuggerOnLoad, false);
@ -231,10 +228,8 @@ void Config::Save() {
bFirstRun = false;
general->Set("FirstRun", bFirstRun);
general->Set("Enable Logging", bEnableLogging);
general->Set("AutoLoadLast", bAutoLoadLast);
general->Set("AutoRun", bAutoRun);
general->Set("Browse", bBrowse);
general->Set("ConfirmOnQuit", bConfirmOnQuit);
general->Set("IgnoreBadMemAccess", bIgnoreBadMemAccess);
general->Set("CurrentDirectory", currentDirectory);
general->Set("ShowDebuggerOnLoad", bShowDebuggerOnLoad);

14
Core/Config.h
View File

@ -34,21 +34,17 @@ public:
bool bSaveSettings;
bool bFirstRun;
// These are broken
bool bAutoLoadLast;
bool bSpeedLimit;
bool bConfirmOnQuit;
bool bAutoRun; // start immediately
bool bBrowse;
#ifdef _WIN32
bool bTopMost;
#endif
bool bBrowse; // when opening the emulator, immediately show a file browser
// General
int iNumWorkerThreads;
bool bScreenshotsAsPNG;
bool bEnableLogging;
#ifdef _WIN32
bool bTopMost;
#endif
// Core
bool bIgnoreBadMemAccess;
bool bFastMemory;

4
Windows/WndMainWindow.cpp
View File

@ -736,9 +736,6 @@ namespace MainWindow
case ID_EMULATION_CHEATS:
NativeMessageReceived("reset", "");
break;
case ID_EMULATION_SPEEDLIMIT:
g_Config.bSpeedLimit = !g_Config.bSpeedLimit;
break;
case ID_EMULATION_RENDER_MODE_OGL:
g_Config.bSoftwareRendering = false;
@ -1271,7 +1268,6 @@ namespace MainWindow
void UpdateMenus() {
HMENU menu = GetMenu(GetHWND());
#define CHECKITEM(item,value) CheckMenuItem(menu,item,MF_BYCOMMAND | ((value) ? MF_CHECKED : MF_UNCHECKED));
CHECKITEM(ID_EMULATION_SPEEDLIMIT,g_Config.bSpeedLimit);
CHECKITEM(ID_OPTIONS_IGNOREILLEGALREADS,g_Config.bIgnoreBadMemAccess);
CHECKITEM(ID_CPU_INTERPRETER,g_Config.bJit == false);
CHECKITEM(ID_CPU_DYNAREC,g_Config.bJit == true);