diff options
Diffstat (limited to 'src/dirs.cpp')
| -rw-r--r-- | src/dirs.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index 44b23be0a..ebb86c13e 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -2,7 +2,8 @@ * The ManaPlus Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2019 The ManaPlus Developers + * Copyright (C) 2011-2020 The ManaPlus Developers + * Copyright (C) 2020-2023 The ManaVerse Developers * * This file is part of The ManaPlus Client. * @@ -70,7 +71,7 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" #if defined __native_client__ -#define _nacl_dir std::string("/persistent/manaplus") +#define _nacl_dir std::string("/persistent/manaverse") #endif // defined __native_client__ #ifdef ANDROID @@ -116,7 +117,7 @@ void extractAssets() FILE *const file = fopen(fileName.c_str(), "w"); for (int f = 0; f < 100; f ++) { - std::string part = strprintf("manaplus-data.zip%u%u", + std::string part = strprintf("manaverse-data.zip%u%u", CAST_U32(f / 10), CAST_U32(f % 10)); logger->log("testing asset: " + part); @@ -140,7 +141,7 @@ void extractAssets() const std::string fileName2 = pathJoin(getenv("APPDIR"), "locale.zip"); FILE *const file2 = fopen(fileName2.c_str(), "w"); - SDL_RWops *const rw = SDL_RWFromFile("manaplus-locale.zip", "r"); + SDL_RWops *const rw = SDL_RWFromFile("manaverse-locale.zip", "r"); if (rw) { const int size = SDL_RWsize(rw); @@ -249,7 +250,7 @@ void Dirs::mountDataDir() { std::string path = settings.options.brandingPath; - // Strip blah.manaplus from the path + // Strip *.mana from the path const int loc = CAST_S32(path.find_last_of('/')); if (loc > 0) @@ -343,19 +344,19 @@ void Dirs::initLocalDataDir() // Use Application Directory instead of .mana settings.localDataDir = pathJoin(VirtFs::getUserDir(), "Library/Application Support", - branding.getValue("appName", "ManaPlus")); + branding.getValue("appName", "ManaVerse")); #elif defined __HAIKU__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - "config/cache/Mana"); + "config/cache/ManaVerse"); #elif defined WIN32 settings.localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA); if (settings.localDataDir.empty()) settings.localDataDir = VirtFs::getUserDir(); settings.localDataDir = pathJoin(settings.localDataDir, - "Mana"); + "ManaVerse"); #elif defined __ANDROID__ settings.localDataDir = pathJoin(getSdStoragePath(), - branding.getValue("appShort", "ManaPlus"), + branding.getValue("appShort", "ManaVerse"), "local"); #elif defined __native_client__ settings.localDataDir = pathJoin(_nacl_dir, "local"); @@ -364,7 +365,7 @@ void Dirs::initLocalDataDir() #else // __APPLE__ settings.localDataDir = pathJoin(VirtFs::getUserDir(), - ".local/share/mana"); + ".local/share/manaverse"); #endif // __APPLE__ } @@ -400,11 +401,11 @@ void Dirs::initConfigDir() { #ifdef __APPLE__ settings.configDir = pathJoin(settings.localDataDir, - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); #elif defined __HAIKU__ settings.configDir = pathJoin(VirtFs::getUserDir(), - "config/settings/Mana", - branding.getValue("appName", "ManaPlus")); + "config/settings/ManaVerse", + branding.getValue("appName", "ManaVerse")); #elif defined WIN32 settings.configDir = getSpecialFolderLocation(CSIDL_APPDATA); if (settings.configDir.empty()) @@ -415,11 +416,11 @@ void Dirs::initConfigDir() { settings.configDir = pathJoin(settings.configDir, "mana", - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); } #elif defined __ANDROID__ settings.configDir = pathJoin(getSdStoragePath(), - branding.getValue("appShort", "ManaPlus"), + branding.getValue("appShort", "ManaVerse"), "config"); #elif defined __native_client__ settings.configDir = pathJoin(_nacl_dir, "config"); @@ -429,7 +430,7 @@ void Dirs::initConfigDir() settings.configDir = pathJoin(VirtFs::getUserDir(), ".config/mana", - branding.getValue("appShort", "mana")); + branding.getValue("appShort", "manaverse")); #endif // __APPLE__ logger->log("Generating config dir: " + settings.configDir); @@ -579,7 +580,7 @@ void Dirs::initScreenshotDir() if (config.getBoolValue("useScreenshotDirectorySuffix")) { const std::string configScreenshotSuffix = - branding.getValue("screenshots", "ManaPlus"); + branding.getValue("screenshots", "ManaVerse"); if (!configScreenshotSuffix.empty()) { |