libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-01 04:10:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3550 from thedax/master

Browse Source 
Game loading: Fix a bug and prevent a "file is corrupt" error for demos/np PBPs that really aren't corrupt.
This commit is contained in:
Henrik Rydgård 2013-09-01 10:32:29 -07:00
commit cfbf83eeab
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Loaders.cpp
View File

@ -162,6 +162,13 @@ bool LoadFile(std::string &filename, std::string *error_string) {
if (fileInfo.exists) {
INFO_LOG(LOADER, "File is a PBP in a directory!");
std::string ebootPath = filename + "/EBOOT.PBP";
IdentifiedFileType ebootType = Identify_File(ebootPath);
if(ebootType == FILETYPE_PSP_ISO_NP) {
InitMemoryForGameISO(ebootPath);
pspFileSystem.SetStartingDirectory("disc0:/PSP_GAME/USRDIR");
return Load_PSP_ISO(filename.c_str(), error_string);
}
std::string path = filename;
size_t pos = path.find("/PSP/GAME/");
if (pos != std::string::npos)
@ -213,6 +220,7 @@ bool LoadFile(std::string &filename, std::string *error_string) {
case FILETYPE_NORMAL_DIRECTORY:
ERROR_LOG(LOADER, "Just a directory.");
*error_string = "Just a directory.";
break;
case FILETYPE_UNKNOWN_BIN: