Merge pull request #733 from raven02/patch-3

Show game title and ID in log
This commit is contained in:
B1ackDaemon 2014-08-09 19:10:42 +03:00
commit e9835d4a2c
2 changed files with 14 additions and 2 deletions

View file

@ -266,13 +266,13 @@ public:
#endif #endif
{ {
m_base_addr = nullptr; m_base_addr = nullptr;
LOG_ERROR(MEMORY, "Initing memory failed"); LOG_ERROR(MEMORY, "Initialing memory failed");
assert(0); assert(0);
return; return;
} }
else else
{ {
LOG_NOTICE(MEMORY, "Initing memory: m_base_addr = 0x%llx", (u64)m_base_addr); LOG_NOTICE(MEMORY, "Initialing memory: m_base_addr = 0x%llx", (u64)m_base_addr);
} }
switch(type) switch(type)

View file

@ -16,6 +16,8 @@
#include "Emu/CPU/CPUThreadManager.h" //gui dependency #include "Emu/CPU/CPUThreadManager.h" //gui dependency
#include "../Loader/PSF.h"
#include "../Crypto/unself.h" #include "../Crypto/unself.h"
#include <cstdlib> #include <cstdlib>
#include <fstream> #include <fstream>
@ -165,6 +167,16 @@ void Emulator::Load()
{ {
LOG_NOTICE(LOADER, "%s -> %s", m_vfs.m_devices[i]->GetPs3Path().c_str(), m_vfs.m_devices[i]->GetLocalPath().c_str()); LOG_NOTICE(LOADER, "%s -> %s", m_vfs.m_devices[i]->GetPs3Path().c_str(), m_vfs.m_devices[i]->GetLocalPath().c_str());
} }
LOG_NOTICE(LOADER, " ");//used to be skip_line
vfsFile sfo("/app_home/PARAM.SFO");
PSFLoader psf(sfo);
psf.Load(false);
std::string title = psf.GetString("TITLE");
std::string title_id = psf.GetString("TITLE_ID");
LOG_NOTICE(LOADER, "Title: %s", title.c_str());
LOG_NOTICE(LOADER, "Serial: %s", title_id.c_str());
// bdvd inserting imitation // bdvd inserting imitation
vfsFile f1("/app_home/dev_bdvd.path"); vfsFile f1("/app_home/dev_bdvd.path");
if (f1.IsOpened()) if (f1.IsOpened())