mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-10 08:51:28 +12:00
Removed "Boot game and start" entry
There is already a setting on the menu (Settings > HLE > Always start after boot) to do that. Make it active by default since disabling it is only useful for debugging purposes.
This commit is contained in:
parent
abbd3ae239
commit
602c436e1c
6 changed files with 700 additions and 737 deletions
1376
rpcs3/Emu/GS/GCM.h
1376
rpcs3/Emu/GS/GCM.h
File diff suppressed because it is too large
Load diff
|
@ -353,7 +353,7 @@ std::string GLVertexDecompilerThread::BuildCode()
|
||||||
{ "tc6", true, "dst_reg13", "", false },
|
{ "tc6", true, "dst_reg13", "", false },
|
||||||
{ "tc7", true, "dst_reg14", "", false },
|
{ "tc7", true, "dst_reg14", "", false },
|
||||||
{ "tc8", true, "dst_reg15", "", false },
|
{ "tc8", true, "dst_reg15", "", false },
|
||||||
{ "tc9", true, "dst_reg6", "", false }
|
{ "tc9", true, "dst_reg6", "", false } // In this line, dst_reg6 is correct since dst_reg goes from 0 to 15.
|
||||||
};
|
};
|
||||||
|
|
||||||
std::string f;
|
std::string f;
|
||||||
|
|
|
@ -1524,7 +1524,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Anti aliasing
|
// Anti-aliasing
|
||||||
case NV4097_SET_ANTI_ALIASING_CONTROL:
|
case NV4097_SET_ANTI_ALIASING_CONTROL:
|
||||||
{
|
{
|
||||||
// TODO:
|
// TODO:
|
||||||
|
|
|
@ -206,12 +206,14 @@ void GameViewer::DClick(wxListEvent& event)
|
||||||
Emu.Stop();
|
Emu.Stop();
|
||||||
Emu.GetVFS().Init(path);
|
Emu.GetVFS().Init(path);
|
||||||
std::string local_path;
|
std::string local_path;
|
||||||
if(Emu.GetVFS().GetDevice(path, local_path) && !Emu.BootGame(local_path))
|
if (Emu.GetVFS().GetDevice(path, local_path) && !Emu.BootGame(local_path)) {
|
||||||
{
|
|
||||||
LOG_ERROR(HLE, "Boot error: elf not found! [%s]", path.c_str());
|
LOG_ERROR(HLE, "Boot error: elf not found! [%s]", path.c_str());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Emu.Run();
|
|
||||||
|
if (Ini.HLEAlwaysStart.GetValue() && Emu.IsReady()) {
|
||||||
|
Emu.Run();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GameViewer::RightClick(wxListEvent& event)
|
void GameViewer::RightClick(wxListEvent& event)
|
||||||
|
|
|
@ -40,10 +40,8 @@ enum IDs
|
||||||
id_tools_compiler,
|
id_tools_compiler,
|
||||||
id_tools_memory_viewer,
|
id_tools_memory_viewer,
|
||||||
id_tools_rsx_debugger,
|
id_tools_rsx_debugger,
|
||||||
id_tools_fnid_generator,
|
|
||||||
id_help_about,
|
id_help_about,
|
||||||
id_update_dbg,
|
id_update_dbg,
|
||||||
id_boot_game_and_run,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
wxString GetPaneName()
|
wxString GetPaneName()
|
||||||
|
@ -69,11 +67,10 @@ MainFrame::MainFrame()
|
||||||
|
|
||||||
wxMenu* menu_boot = new wxMenu();
|
wxMenu* menu_boot = new wxMenu();
|
||||||
menubar->Append(menu_boot, "Boot");
|
menubar->Append(menu_boot, "Boot");
|
||||||
|
menu_boot->Append(id_boot_elf, "Boot ELF / SELF file");
|
||||||
menu_boot->Append(id_boot_game, "Boot game");
|
menu_boot->Append(id_boot_game, "Boot game");
|
||||||
menu_boot->Append(id_boot_game_and_run, "Boot game and start");
|
|
||||||
menu_boot->Append(id_install_pkg, "Install PKG");
|
|
||||||
menu_boot->AppendSeparator();
|
menu_boot->AppendSeparator();
|
||||||
menu_boot->Append(id_boot_elf, "Boot (S)ELF");
|
menu_boot->Append(id_install_pkg, "Install PKG");
|
||||||
|
|
||||||
wxMenu* menu_sys = new wxMenu();
|
wxMenu* menu_sys = new wxMenu();
|
||||||
menubar->Append(menu_sys, "System");
|
menubar->Append(menu_sys, "System");
|
||||||
|
@ -113,10 +110,9 @@ MainFrame::MainFrame()
|
||||||
AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT);
|
AddPane(m_debugger_frame, "Debugger", wxAUI_DOCK_RIGHT);
|
||||||
|
|
||||||
// Events
|
// Events
|
||||||
Bind(wxEVT_MENU, &MainFrame::BootGame, this, id_boot_game);
|
|
||||||
Bind(wxEVT_MENU, &MainFrame::BootGameAndRun, this, id_boot_game_and_run);
|
|
||||||
Bind(wxEVT_MENU, &MainFrame::InstallPkg, this, id_install_pkg);
|
|
||||||
Bind(wxEVT_MENU, &MainFrame::BootElf, this, id_boot_elf);
|
Bind(wxEVT_MENU, &MainFrame::BootElf, this, id_boot_elf);
|
||||||
|
Bind(wxEVT_MENU, &MainFrame::BootGame, this, id_boot_game);
|
||||||
|
Bind(wxEVT_MENU, &MainFrame::InstallPkg, this, id_install_pkg);
|
||||||
|
|
||||||
Bind(wxEVT_MENU, &MainFrame::Pause, this, id_sys_pause);
|
Bind(wxEVT_MENU, &MainFrame::Pause, this, id_sys_pause);
|
||||||
Bind(wxEVT_MENU, &MainFrame::Stop, this, id_sys_stop);
|
Bind(wxEVT_MENU, &MainFrame::Stop, this, id_sys_stop);
|
||||||
|
@ -201,40 +197,6 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainFrame::BootGameAndRun(wxCommandEvent& WXUNUSED(event))
|
|
||||||
{
|
|
||||||
bool stopped = false;
|
|
||||||
|
|
||||||
if (Emu.IsRunning())
|
|
||||||
{
|
|
||||||
Emu.Pause();
|
|
||||||
stopped = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
wxDirDialog ctrl(this, L"Select game folder", wxEmptyString);
|
|
||||||
|
|
||||||
if (ctrl.ShowModal() == wxID_CANCEL)
|
|
||||||
{
|
|
||||||
if (stopped) Emu.Resume();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Emu.Stop();
|
|
||||||
|
|
||||||
if (Emu.BootGame(ctrl.GetPath().ToStdString()))
|
|
||||||
{
|
|
||||||
LOG_SUCCESS(HLE, "Game: boot done.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
LOG_ERROR(HLE, "PS3 executable not found in selected folder (%s)", ctrl.GetPath().wx_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Emu.IsReady())
|
|
||||||
{
|
|
||||||
Emu.Run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
void MainFrame::InstallPkg(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
bool stopped = false;
|
bool stopped = false;
|
||||||
|
@ -299,7 +261,6 @@ void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event))
|
||||||
LOG_NOTICE(HLE, "(S)ELF: booting...");
|
LOG_NOTICE(HLE, "(S)ELF: booting...");
|
||||||
|
|
||||||
Emu.Stop();
|
Emu.Stop();
|
||||||
|
|
||||||
Emu.SetPath(fmt::ToUTF8(ctrl.GetPath()));
|
Emu.SetPath(fmt::ToUTF8(ctrl.GetPath()));
|
||||||
Emu.Load();
|
Emu.Load();
|
||||||
|
|
||||||
|
|
|
@ -276,7 +276,7 @@ public:
|
||||||
HLESaveTTY.Load(false);
|
HLESaveTTY.Load(false);
|
||||||
HLEExitOnStop.Load(false);
|
HLEExitOnStop.Load(false);
|
||||||
HLELogLvl.Load(3);
|
HLELogLvl.Load(3);
|
||||||
HLEAlwaysStart.Load(false);
|
HLEAlwaysStart.Load(true);
|
||||||
|
|
||||||
// Language
|
// Language
|
||||||
SysLanguage.Load(1);
|
SysLanguage.Load(1);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue