ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cmdline: --nogui, --cdvd, --nodisc, --fullboot, and IsoFile implemented parameters implemented. Example: 

pcsx2 someIso.iso  (boots game)
  pcsx2 --nogui someIso.iso  (boots game without the pcsx2 std interface)
  pcsx2 --nogui --nodisc  (boots into the bios system menu)

... more coming soon!

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3243 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-19 15:54:14 +00:00
parent c996934a1e
commit 50313e4538
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcsx2/gui/AppInit.cpp
View File

@ -236,7 +236,7 @@ void Pcsx2App::OpenProgramLog()
void Pcsx2App::AllocateCoreStuffs() void Pcsx2App::AllocateCoreStuffs()
{ {
if( AppRpc_TryInvokeAsync( &Pcsx2App::OpenMainFrame ) ) return; if( AppRpc_TryInvokeAsync( &Pcsx2App::AllocateCoreStuffs ) ) return;
CpuCheckSSE2(); CpuCheckSSE2();
SysLogMachineCaps(); SysLogMachineCaps();
@ -523,10 +523,19 @@ bool Pcsx2App::OnInit()
// ------------------------------------- // -------------------------------------
if( Startup.ForceConsole ) g_Conf->ProgLogBox.Visible = true; if( Startup.ForceConsole ) g_Conf->ProgLogBox.Visible = true;
OpenProgramLog(); OpenProgramLog();
if( m_UseGUI ) OpenMainFrame(); if( m_UseGUI ) OpenMainFrame();
AllocateCoreStuffs(); AllocateCoreStuffs();
if( Startup.SysAutoRun )
{
// Notes: Saving/remembering the Iso file is probably fine and desired, so using
// SysUpdateIsoSrcFile is good(ish).
// Saving the cdvd plugin override isn't desirable, so we don't assign it into g_Conf.
g_Conf->EmuOptions.UseBOOT2Injection = !Startup.NoFastBoot;
SysUpdateIsoSrcFile( Startup.IsoFile );
sApp.SysExecute( Startup.CdvdSource );
}
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
catch( Exception::StartupAborted& ex ) // user-aborted, no popups needed. catch( Exception::StartupAborted& ex ) // user-aborted, no popups needed.

6
pcsx2/gui/AppMain.cpp
View File

@ -799,6 +799,12 @@ void Pcsx2App::OnGsFrameClosed( wxWindowID id )
CoreThread.Suspend(); CoreThread.Suspend();
m_id_GsFrame = wxID_ANY; m_id_GsFrame = wxID_ANY;
if( !m_UseGUI )
{
// [TODO] : Prompt user before exiting, k thx. :)
PrepForExit();
}
} }
void Pcsx2App::OnProgramLogClosed( wxWindowID id ) void Pcsx2App::OnProgramLogClosed( wxWindowID id )

2
pcsx2/gui/MainMenuClicks.cpp
View File

@ -125,7 +125,7 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co
{ {
wxWindowID result = wxID_CANCEL; wxWindowID result = wxID_CANCEL;
if( g_Conf->CdvdSource == CDVDsrc_Iso && isoFilename == g_Conf->CurrentIso ) if( (g_Conf->CdvdSource == CDVDsrc_Iso) && (isoFilename == g_Conf->CurrentIso) )
{ {
core_control.AllowResume(); core_control.AllowResume();
return result; return result;