thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename flashDirectory to flash0Directory.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-10-12 16:08:39 -07:00
parent c0e3f1523e
commit af2ccbb9da
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Core/Config.h
View file

@ -173,7 +173,7 @@ public:
std::string currentDirectory; std::string currentDirectory;
std::string externalDirectory; std::string externalDirectory;
std::string memCardDirectory; std::string memCardDirectory;
std::string flashDirectory; std::string flash0Directory;
std::string internalDataDirectory; std::string internalDataDirectory;
void Load(const char *iniFileName = "ppsspp.ini", const char *controllerIniFilename = "controls.ini"); void Load(const char *iniFileName = "ppsspp.ini", const char *controllerIniFilename = "controls.ini");

2
Core/System.cpp
View file

@ -379,6 +379,6 @@ void GetSysDirectories(std::string &memstickpath, std::string &flash0path) {
#else #else
// TODO // TODO
memstickpath = g_Config.memCardDirectory; memstickpath = g_Config.memCardDirectory;
flash0path = g_Config.flashDirectory; flash0path = g_Config.flash0Directory;
#endif #endif
} }

2
Qt/QtHost.cpp
View file

@ -309,7 +309,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
} }
g_Config.memCardDirectory = QDir::homePath().toStdString()+"/.ppsspp/"; g_Config.memCardDirectory = QDir::homePath().toStdString()+"/.ppsspp/";
g_Config.flashDirectory = g_Config.memCardDirectory+"/flash0/"; g_Config.flash0Directory = g_Config.memCardDirectory+"/flash0/";
LogManager::Init(); LogManager::Init();
if (fileToLog != NULL) if (fileToLog != NULL)

6
UI/NativeApp.cpp
View file

@ -252,14 +252,14 @@ void NativeInit(int argc, const char *argv[],
// that for most people, using external memory (SDCard/USB Storage) makes the // that for most people, using external memory (SDCard/USB Storage) makes the
// most sense. // most sense.
g_Config.memCardDirectory = std::string(external_directory) + "/"; g_Config.memCardDirectory = std::string(external_directory) + "/";
g_Config.flashDirectory = std::string(external_directory) + "/flash0/"; g_Config.flash0Directory = std::string(external_directory) + "/flash0/";
#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(IOS) #elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(IOS)
g_Config.memCardDirectory = user_data_path; g_Config.memCardDirectory = user_data_path;
g_Config.flashDirectory = std::string(external_directory) + "/flash0/"; g_Config.flash0Directory = std::string(external_directory) + "/flash0/";
#elif !defined(_WIN32) #elif !defined(_WIN32)
// Linux, Mac. Does this path really make sense? // Linux, Mac. Does this path really make sense?
g_Config.memCardDirectory = std::string(getenv("HOME")) + "/.ppsspp/"; g_Config.memCardDirectory = std::string(getenv("HOME")) + "/.ppsspp/";
g_Config.flashDirectory = g_Config.memCardDirectory + "/flash0/"; g_Config.flash0Directory = g_Config.memCardDirectory + "/flash0/";
#endif #endif
#ifndef _WIN32 #ifndef _WIN32

2
android/jni/TestRunner.cpp
View file

@ -73,7 +73,7 @@ void RunTests()
coreParam.updateRecent = false; coreParam.updateRecent = false;
#ifdef IOS #ifdef IOS
std::string baseDirectory = g_Config.flashDirectory + "../"; std::string baseDirectory = g_Config.flash0Directory + "../";
#else #else
std::string baseDirectory = g_Config.memCardDirectory; std::string baseDirectory = g_Config.memCardDirectory;
#endif #endif

2
headless/Headless.cpp
View file

@ -329,7 +329,7 @@ int main(int argc, const char* argv[])
#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) #elif defined(BLACKBERRY) || defined(__SYMBIAN32__)
#elif !defined(_WIN32) #elif !defined(_WIN32)
g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/"; g_Config.memCardDirectory = std::string(getenv("HOME"))+"/.ppsspp/";
g_Config.flashDirectory = g_Config.memCardDirectory+"/flash/"; g_Config.flash0Directory = g_Config.memCardDirectory+"/flash/";
#endif #endif
if (screenshotFilename != 0) if (screenshotFilename != 0)