From 7e89477e6c6189b03c8636c7853e5612ab82f45d Mon Sep 17 00:00:00 2001 From: tadatada Date: Wed, 8 Oct 2014 15:56:19 +0900 Subject: [PATCH] Cheats: Added a cheats related log, changed color of a few positive logs. If any cheats file is not found, the "Not found Cheats file" message will appear with its full path of the cheats file on the log screen. Changed color of a few positive logs to green from grey. --- pcsx2/Patch.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 93f0885e12..269cf17f1d 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -181,8 +181,10 @@ void ResetCheatsCount() cheatnumber = 0; } -static int LoadCheatsFiles(const wxDirName& folderName, wxString& fileSpec, const wxString& friendlyName) +static int LoadCheatsFiles(const wxDirName& folderName, wxString& fileSpec, const wxString& friendlyName, int& numberFoundCheatsFiles) { + numberFoundCheatsFiles = 0; + if (!folderName.Exists()) { Console.WriteLn(Color_Red, L"The %s folder ('%s') is inaccessible. Skipping...", WX_STR(friendlyName), WX_STR(folderName.ToString())); return 0; @@ -195,13 +197,14 @@ static int LoadCheatsFiles(const wxDirName& folderName, wxString& fileSpec, cons bool found = dir.GetFirst(&buffer, L"*", wxDIR_FILES); while (found) { if (buffer.Upper().Matches(fileSpec.Upper())) { - Console.WriteLn(Color_Gray, L"Found %s file: '%s'", WX_STR(friendlyName), WX_STR(buffer)); + Console.WriteLn(Color_Green, L"Found %s file: '%s'", WX_STR(friendlyName), WX_STR(buffer)); int before = cheatnumber; f.Open(Path::Combine(dir.GetName(), buffer)); inifile_process(f); f.Close(); int loaded = cheatnumber - before; Console.WriteLn((loaded ? Color_Green : Color_Gray), L"Loaded %d %s from '%s'", loaded, WX_STR(friendlyName), WX_STR(buffer)); + numberFoundCheatsFiles ++; } found = dir.GetNext(&buffer); } @@ -226,7 +229,7 @@ int LoadCheatsFromZip(wxString gameCRC, const wxString& cheatsArchiveFilename) { wxString name = entry->GetName(); name.MakeUpper(); if (name.Find(gameCRC) == 0 && name.Find(L".PNACH")+6u == name.Length()) { - Console.WriteLn(Color_Gray, L"Loading patch '%s' from archive '%s'", + Console.WriteLn(Color_Green, L"Loading patch '%s' from archive '%s'", WX_STR(entry->GetName()), WX_STR(cheatsArchiveFilename)); wxTextInputStream pnach(zip); while (!zip.Eof()) { @@ -245,9 +248,15 @@ int LoadCheatsFromZip(wxString gameCRC, const wxString& cheatsArchiveFilename) { int LoadCheats(wxString name, const wxDirName& folderName, const wxString& friendlyName) { int loaded = 0; + int numberFoundCheatsFiles; wxString filespec = name + L"*.pnach"; - loaded += LoadCheatsFiles(folderName, filespec, friendlyName); + loaded += LoadCheatsFiles(folderName, filespec, friendlyName, numberFoundCheatsFiles); + + if (folderName.ToString().IsSameAs(PathDefs::GetCheats().ToString()) && numberFoundCheatsFiles == 0) { + wxString pathName = Path::Combine(folderName, name.MakeUpper() + L".pnach"); + Console.WriteLn(Color_Gray, L"Not found %s file: %s", WX_STR(friendlyName), WX_STR(pathName)); + } Console.WriteLn((loaded ? Color_Green : Color_Gray), L"Overall %d %s loaded", loaded, WX_STR(friendlyName)); return loaded;