mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-09-23 14:53:52 +00:00
Merge branch 'master' into mac
# Conflicts: # AerofoilX/GpMain_SDL_X.cpp
This commit is contained in:
@@ -185,8 +185,8 @@ bool GpFileSystem_X::ResolvePath(PortabilityLayer::VirtualDirectory_t virtualDir
|
||||
case PortabilityLayer::VirtualDirectories::kPrefs:
|
||||
prefsAppend = "Prefs";
|
||||
break;
|
||||
case PortabilityLayer::VirtualDirectories::kFontCache:
|
||||
prefsAppend = "FontCache";
|
||||
case PortabilityLayer::VirtualDirectories::kLogs:
|
||||
prefsAppend = "Logs";
|
||||
break;
|
||||
case PortabilityLayer::VirtualDirectories::kLogs:
|
||||
prefsAppend = "..";
|
||||
@@ -231,7 +231,7 @@ void GpFileSystem_X::Init()
|
||||
if (m_basePath.size() >= 4 && m_basePath.substr(m_basePath.size() - 4, 3) == "bin")
|
||||
m_basePath = m_basePath.substr(0, m_basePath.size() - 4) + "lib" + baseDirSeparator + "aerofoil" + baseDirSeparator;
|
||||
|
||||
const char *extensions[] = { "HighScores", "Houses", "SavedGames", "Prefs", "FontCache" };
|
||||
const char *extensions[] = { "HighScores", "Houses", "SavedGames", "Prefs", "Logs" };
|
||||
for (size_t i = 0; i < sizeof(extensions) / sizeof(extensions[0]); i++)
|
||||
{
|
||||
std::string prefsPath = std::string(prefsDir) + extensions[i];
|
||||
|
Reference in New Issue
Block a user