archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 03:38:38 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved autostart to HLE Section

Browse source
This commit is contained in:
Blaypeg 2014-06-01 14:10:26 +01:00
parent 0d3b8c0808
commit 934856c350
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Gui/MainFrame.cpp
View file

@ -188,7 +188,7 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
{ {
ConLog.Success("Game: boot done."); ConLog.Success("Game: boot done.");
if (Ini.CPUAlwaysStart.GetValue() && Emu.IsReady()) if (Ini.HLEAlwaysStart.GetValue() && Emu.IsReady())
{ {
Emu.Run(); Emu.Run();
} }
@ -422,7 +422,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
wxCheckBox* chbox_hle_savetty = new wxCheckBox(p_hle, wxID_ANY, "Save TTY output to file"); wxCheckBox* chbox_hle_savetty = new wxCheckBox(p_hle, wxID_ANY, "Save TTY output to file");
wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(p_hle, wxID_ANY, "Exit RPCS3 when process finishes"); wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(p_hle, wxID_ANY, "Exit RPCS3 when process finishes");
wxCheckBox* chbox_hle_hide_debug_console = new wxCheckBox(p_hle, wxID_ANY, "Hide Debug Console"); wxCheckBox* chbox_hle_hide_debug_console = new wxCheckBox(p_hle, wxID_ANY, "Hide Debug Console");
wxCheckBox* chbox_cpu_always_start = new wxCheckBox(p_cpu, wxID_ANY, "Always start after boot"); wxCheckBox* chbox_hle_always_start = new wxCheckBox(p_hle, wxID_ANY, "Always start after boot");
//cbox_cpu_decoder->Append("DisAsm"); //cbox_cpu_decoder->Append("DisAsm");
cbox_cpu_decoder->Append("Interpreter & DisAsm"); cbox_cpu_decoder->Append("Interpreter & DisAsm");
@ -500,7 +500,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
chbox_hle_savetty ->SetValue(Ini.HLESaveTTY.GetValue()); chbox_hle_savetty ->SetValue(Ini.HLESaveTTY.GetValue());
chbox_hle_exitonstop ->SetValue(Ini.HLEExitOnStop.GetValue()); chbox_hle_exitonstop ->SetValue(Ini.HLEExitOnStop.GetValue());
chbox_hle_hide_debug_console->SetValue(Ini.HLEHideDebugConsole.GetValue()); chbox_hle_hide_debug_console->SetValue(Ini.HLEHideDebugConsole.GetValue());
chbox_cpu_always_start ->SetValue(Ini.CPUAlwaysStart.GetValue()); chbox_hle_always_start ->SetValue(Ini.HLEAlwaysStart.GetValue());
cbox_cpu_decoder ->SetSelection(Ini.CPUDecoderMode.GetValue() ? Ini.CPUDecoderMode.GetValue() - 1 : 0); cbox_cpu_decoder ->SetSelection(Ini.CPUDecoderMode.GetValue() ? Ini.CPUDecoderMode.GetValue() - 1 : 0);
cbox_spu_decoder ->SetSelection(Ini.SPUDecoderMode.GetValue() ? Ini.SPUDecoderMode.GetValue() - 1 : 0); cbox_spu_decoder ->SetSelection(Ini.SPUDecoderMode.GetValue() ? Ini.SPUDecoderMode.GetValue() - 1 : 0);
@ -541,7 +541,6 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
// Core // Core
s_subpanel_cpu->Add(s_round_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_cpu->Add(s_round_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand());
s_round_cpu_decoder->Add(chbox_cpu_ignore_rwerrors, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_cpu_decoder->Add(chbox_cpu_ignore_rwerrors, wxSizerFlags().Border(wxALL, 5).Expand());
s_round_cpu_decoder->Add(chbox_cpu_always_start, wxSizerFlags().Border(wxALL, 5).Expand());
s_subpanel_cpu->Add(s_round_spu_decoder, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_cpu->Add(s_round_spu_decoder, wxSizerFlags().Border(wxALL, 5).Expand());
// Graphics // Graphics
@ -570,6 +569,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
s_subpanel_hle->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_hle->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand());
s_subpanel_hle->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_hle->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand());
s_subpanel_hle->Add(chbox_hle_hide_debug_console, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_hle->Add(chbox_hle_hide_debug_console, wxSizerFlags().Border(wxALL, 5).Expand());
s_subpanel_hle->Add(chbox_hle_always_start, wxSizerFlags().Border(wxALL, 5).Expand());
// System // System
s_subpanel_system->Add(s_round_sys_lang, wxSizerFlags().Border(wxALL, 5).Expand()); s_subpanel_system->Add(s_round_sys_lang, wxSizerFlags().Border(wxALL, 5).Expand());
@ -615,7 +615,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
Ini.HLELogLvl.SetValue(cbox_hle_loglvl->GetSelection()); Ini.HLELogLvl.SetValue(cbox_hle_loglvl->GetSelection());
Ini.SysLanguage.SetValue(cbox_sys_lang->GetSelection()); Ini.SysLanguage.SetValue(cbox_sys_lang->GetSelection());
Ini.HLEHideDebugConsole.SetValue(chbox_hle_hide_debug_console->GetValue()); Ini.HLEHideDebugConsole.SetValue(chbox_hle_hide_debug_console->GetValue());
Ini.CPUAlwaysStart.SetValue(chbox_cpu_always_start->GetValue()); Ini.HLEAlwaysStart.SetValue(chbox_hle_always_start->GetValue());
Ini.Save(); Ini.Save();
} }

6
rpcs3/Ini.h
View file

@ -119,7 +119,7 @@ public:
IniEntry<u8> SysLanguage; IniEntry<u8> SysLanguage;
IniEntry<bool> SkipPamf; IniEntry<bool> SkipPamf;
IniEntry<bool> HLEHideDebugConsole; IniEntry<bool> HLEHideDebugConsole;
IniEntry<bool> CPUAlwaysStart; IniEntry<bool> HLEAlwaysStart;
IniEntry<int> PadHandlerLStickLeft; IniEntry<int> PadHandlerLStickLeft;
IniEntry<int> PadHandlerLStickDown; IniEntry<int> PadHandlerLStickDown;
@ -218,7 +218,7 @@ public:
{ {
CPUDecoderMode.Load(2); CPUDecoderMode.Load(2);
CPUIgnoreRWErrors.Load(true); CPUIgnoreRWErrors.Load(true);
CPUAlwaysStart.Load(false); HLEAlwaysStart.Load(false);
SPUDecoderMode.Load(1); SPUDecoderMode.Load(1);
GSRenderMode.Load(1); GSRenderMode.Load(1);
GSResolution.Load(4); GSResolution.Load(4);
@ -271,7 +271,7 @@ public:
{ {
CPUDecoderMode.Save(); CPUDecoderMode.Save();
CPUIgnoreRWErrors.Save(); CPUIgnoreRWErrors.Save();
CPUAlwaysStart.Save(); HLEAlwaysStart.Save();
SPUDecoderMode.Save(); SPUDecoderMode.Save();
GSRenderMode.Save(); GSRenderMode.Save();
GSResolution.Save(); GSResolution.Save();