From b6918b1b9b27a1bb2ef08079e6c31c37d75a17cb Mon Sep 17 00:00:00 2001 From: arcum42 Date: Fri, 18 Sep 2009 00:01:44 +0000 Subject: [PATCH] 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 --- pcsx2/gui/ConsoleLogger.cpp | 3 ++- pcsx2/gui/MainMenuClicks.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pcsx2/gui/ConsoleLogger.cpp b/pcsx2/gui/ConsoleLogger.cpp index 667cb2d9da..996a45532a 100644 --- a/pcsx2/gui/ConsoleLogger.cpp +++ b/pcsx2/gui/ConsoleLogger.cpp @@ -574,7 +574,7 @@ namespace Console // [TODO] make this a configurable option? Do we care? :) #ifdef __LINUX__ // puts does automatic newlines, which we don't want here - fputs( "PCSX2 > ", stdout ); + //fputs( "PCSX2 > ", stdout ); fputs( src, stdout ); #endif @@ -635,6 +635,7 @@ namespace Console bool __fastcall WriteLn( const wxString& fmt ) { const wxString fmtline( fmt + L"\n" ); + _immediate_logger( "PCSX2 > "); _immediate_logger( fmtline ); if( emuLog != NULL ) diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index 6adfb1b205..de7e88c202 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -144,13 +144,15 @@ void MainEmuFrame::Menu_OpenELF_Click(wxCommandEvent &event) void MainEmuFrame::Menu_LoadStates_Click(wxCommandEvent &event) { 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) { 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)