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

Hook up the save/load menus and make the Linux console output somewhat less insane. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1847 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-09-18 00:01:44 +00:00
parent e75043b91e
commit b6918b1b9b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/gui/ConsoleLogger.cpp
View File

@ -574,7 +574,7 @@ namespace Console
// [TODO] make this a configurable option? Do we care? :) // [TODO] make this a configurable option? Do we care? :)
#ifdef __LINUX__ #ifdef __LINUX__
// puts does automatic newlines, which we don't want here // puts does automatic newlines, which we don't want here
fputs( "PCSX2 > ", stdout ); //fputs( "PCSX2 > ", stdout );
fputs( src, stdout ); fputs( src, stdout );
#endif #endif
@ -635,6 +635,7 @@ namespace Console
bool __fastcall WriteLn( const wxString& fmt ) bool __fastcall WriteLn( const wxString& fmt )
{ {
const wxString fmtline( fmt + L"\n" ); const wxString fmtline( fmt + L"\n" );
_immediate_logger( "PCSX2 > ");
_immediate_logger( fmtline ); _immediate_logger( fmtline );
if( emuLog != NULL ) if( emuLog != NULL )

6
pcsx2/gui/MainMenuClicks.cpp
View File

@ -144,13 +144,15 @@ void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event)
void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent &event) void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent &event)
{ {
int id = event.GetId() - MenuId_State_Load01 - 1; int id = event.GetId() - MenuId_State_Load01 - 1;
Console::WriteLn("If this were hooked up, it would load slot %d.", id); Console::WriteLn("Loading slot %d.", id);
States_Load(id);
} }
void MainEmuFrame::Menu_SaveStates_Click(wxCommandEvent &event) void MainEmuFrame::Menu_SaveStates_Click(wxCommandEvent &event)
{ {
int id = event.GetId() - MenuId_State_Save01 - 1; int id = event.GetId() - MenuId_State_Save01 - 1;
Console::WriteLn("If this were hooked up, it would save slot %d.", id); Console::WriteLn("Saving to slot %d.", id);
States_Save(id);
} }
void MainEmuFrame::Menu_LoadStateOther_Click(wxCommandEvent &event) void MainEmuFrame::Menu_LoadStateOther_Click(wxCommandEvent &event)