Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

We don't really need DIRECTORY_FLASH0 or DIRECTORY_MEMSTICK.

Browse source
This commit is contained in:
The Dax 2013-10-15 02:28:14 -04:00
parent c7bdeb3084
commit 6efd5b33f7
5 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/System.cpp
View file

@ -374,10 +374,6 @@ std::string GetSysDirectory(PSPDirectories directoryType) {
return g_Config.memCardDirectory + "/PSP/SYSTEM/";
case DIRECTORY_PAUTH:
return g_Config.memCardDirectory + "/PAUTH/";
case DIRECTORY_FLASH0:
return g_Config.flash0Directory;
case DIRECTORY_MEMSTICK:
return g_Config.memCardDirectory;
// Just return the memory stick root if we run into some sort of problem.
default:
ERROR_LOG(FILESYS, "Unknown directory type.");

2
Core/System.h
View file

@ -38,8 +38,6 @@ enum GlobalUIState {
// Use these in conjunction with GetSysDirectory.
enum PSPDirectories {
DIRECTORY_MEMSTICK,
DIRECTORY_FLASH0,
DIRECTORY_CHEATS,
DIRECTORY_SCREENSHOT,
DIRECTORY_SYSTEM,

2
UI/GameInfoCache.cpp
View file

@ -74,7 +74,7 @@ std::vector<std::string> GameInfo::GetSaveDataDirectories() {
std::string memc = GetSysDirectory(DIRECTORY_SAVEDATA);
std::vector<FileInfo> dirs;
getFilesInDir((memc).c_str(), &dirs);
getFilesInDir(memc.c_str(), &dirs);
std::vector<std::string> directories;
for (size_t i = 0; i < dirs.size(); i++) {

5
Windows/WndMainWindow.cpp
View file

@ -1131,10 +1131,7 @@ namespace MainWindow
break;
case ID_FILE_MEMSTICK:
{
std::string memStickDir = GetSysDirectory(DIRECTORY_MEMSTICK);
ShellExecuteA(NULL, "open", memStickDir.c_str(), 0, 0, SW_SHOW);
}
ShellExecuteA(NULL, "open", g_Config.memCardDirectory.c_str(), 0, 0, SW_SHOW);
break;
case ID_TOGGLE_PAUSE:

2
Windows/main.cpp
View file

@ -218,7 +218,7 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
}
// On Win32 it makes more sense to initialize the system directories here
// because GetSysDirectories was called much later than this..
// because the next place it was called was in the EmuThread, and it's too late by then.
InitSysDirectories();
// Load config up here, because those changes below would be overwritten