Merge branch 'master' into mac

# Conflicts:
#	AerofoilX/GpMain_SDL_X.cpp
This commit is contained in:
Madthijs
2021-04-28 19:17:55 +02:00
186 changed files with 6016 additions and 1563 deletions

View File

@@ -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];