archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fix 2

Browse source
This commit is contained in:
Nekotekina 2015-04-17 17:05:28 +03:00
parent 9bedf0d13e
commit d9b53b476f
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
View file

@ -354,6 +354,7 @@ __noinline s32 savedata_op(
vfsFile f(sfo_path); vfsFile f(sfo_path);
PSFLoader psf(f); PSFLoader psf(f);
f.Close();
std::string dir_local_path; std::string dir_local_path;
@ -490,8 +491,9 @@ __noinline s32 savedata_op(
{ {
Emu.GetVFS().CreateFile(sfo_path, true); Emu.GetVFS().CreateFile(sfo_path, true);
vfsFile f(sfo_path, vfsWrite); f.Open(sfo_path, vfsWrite);
psf.Save(f); psf.Save(f);
f.Close();
} }
// Enter the loop where the save files are read/created/deleted // Enter the loop where the save files are read/created/deleted

13
rpcs3/Emu/System.cpp
View file

@ -212,7 +212,8 @@ void Emulator::Load()
} }
LOG_NOTICE(LOADER, " "); //used to be skip_line LOG_NOTICE(LOADER, " "); //used to be skip_line
const PSFLoader psf(vfsFile("/app_home/../PARAM.SFO")); vfsFile f("/app_home/../PARAM.SFO");
const PSFLoader psf(f);
std::string title = psf.GetString("TITLE"); std::string title = psf.GetString("TITLE");
std::string title_id = psf.GetString("TITLE_ID"); std::string title_id = psf.GetString("TITLE_ID");
LOG_NOTICE(LOADER, "Title: %s", title.c_str()); LOG_NOTICE(LOADER, "Title: %s", title.c_str());
@ -222,12 +223,12 @@ void Emulator::Load()
SetTitleID(title_id); SetTitleID(title_id);
// bdvd inserting imitation // bdvd inserting imitation
vfsFile f1("/app_home/../dev_bdvd.path"); f.Open("/app_home/../dev_bdvd.path");
if (f1.IsOpened()) if (f.IsOpened())
{ {
std::string bdvd; std::string bdvd;
bdvd.resize(f1.GetSize()); bdvd.resize(f.GetSize());
f1.Read(&bdvd[0], bdvd.size()); f.Read(&bdvd[0], bdvd.size());
// load desired /dev_bdvd/ real directory and remount // load desired /dev_bdvd/ real directory and remount
Emu.GetVFS().Mount("/dev_bdvd/", bdvd, new vfsDeviceLocalFile()); Emu.GetVFS().Mount("/dev_bdvd/", bdvd, new vfsDeviceLocalFile());
@ -240,7 +241,7 @@ void Emulator::Load()
GetVFS().GetDeviceLocal(m_path, m_elf_path); GetVFS().GetDeviceLocal(m_path, m_elf_path);
} }
vfsFile f(m_elf_path); f.Open(m_elf_path);
if (!f.IsOpened()) if (!f.IsOpened())
{ {