Assume g_Config.memCardDirectory will have a trailing slash. Make InitSysDirectories for Win32 only.

This commit is contained in:
The Dax 2013-10-15 02:40:08 -04:00
parent 6efd5b33f7
commit b549a4e6e5
2 changed files with 8 additions and 6 deletions

View File

@ -363,17 +363,17 @@ CoreParameter &PSP_CoreParameter() {
std::string GetSysDirectory(PSPDirectories directoryType) {
switch (directoryType) {
case DIRECTORY_CHEATS:
return g_Config.memCardDirectory + "/PSP/Cheats/";
return g_Config.memCardDirectory + "PSP/Cheats/";
case DIRECTORY_GAME:
return g_Config.memCardDirectory + "/PSP/GAME/";
return g_Config.memCardDirectory + "PSP/GAME/";
case DIRECTORY_SAVEDATA:
return g_Config.memCardDirectory + "/PSP/SAVEDATA/";
return g_Config.memCardDirectory + "PSP/SAVEDATA/";
case DIRECTORY_SCREENSHOT:
return g_Config.memCardDirectory + "/PSP/SCREENSHOT/";
return g_Config.memCardDirectory + "PSP/SCREENSHOT/";
case DIRECTORY_SYSTEM:
return g_Config.memCardDirectory + "/PSP/SYSTEM/";
return g_Config.memCardDirectory + "PSP/SYSTEM/";
case DIRECTORY_PAUTH:
return g_Config.memCardDirectory + "/PAUTH/";
return g_Config.memCardDirectory + "PAUTH/";
// Just return the memory stick root if we run into some sort of problem.
default:
ERROR_LOG(FILESYS, "Unknown directory type.");

View File

@ -68,7 +68,9 @@ bool IsOnSeparateCPUThread();
bool IsAudioInitialised();
std::string GetSysDirectory(PSPDirectories directoryType);
#ifdef _WIN32
void InitSysDirectories();
#endif
// RUNNING must be at 0, NEXTFRAME must be at 1.
enum CoreState