diff options
| author | jak1 <jak1@themanaworld.org> | 2024-02-16 14:50:14 -0300 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-08-14 00:55:47 +0200 |
| commit | fe2cc2e3a5b0c2ff8fea689017f0b23409670413 (patch) | |
| tree | c9b57a47bcb6d339264a2da6b5d9ec49c0c37583 /src | |
| parent | dc387d4646e29c888784ea38cbebe88299a1e8b2 (diff) | |
| download | plus-master.tar.gz plus-master.tar.bz2 plus-master.tar.xz plus-master.zip | |
Part of "Rename the program from ManaPlus to ManaVerse."
Squashed with:
* Update branding file associations for windows
* Rebrand example branding file
* Branding rebranding back to .mana as picked by jak and explained by bjorn
* Fix code style in path building code
* fix comments
* Change .mana extension comment - there is only one branding inside, not
multiple
**** mana/verse!237
Reviewed-by: Fedja Beader <fedja@protonmail.ch>
Diffstat (limited to 'src')
| -rw-r--r-- | src/commandline.cpp | 5 | ||||
| -rw-r--r-- | src/dirs.cpp | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp index 2d8d48254..9630c3be1 100644 --- a/src/commandline.cpp +++ b/src/commandline.cpp @@ -42,10 +42,11 @@ static void printHelp() { std::cout << // TRANSLATORS: command line help - _("manaplus [options] [manaplus-file]") << + _("manaverse [options] [manaverse-file]") << std::endl << std::endl << // TRANSLATORS: command line help - _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") << + _("[mana-file] : The mana file is an XML file " + "(.mana)") << std::endl << // TRANSLATORS: command line help _(" used to set custom parameters") << diff --git a/src/dirs.cpp b/src/dirs.cpp index 394815a83..2e88aef81 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -246,20 +246,17 @@ void Dirs::mountDataDir() #endif // defined __native_client__ #ifndef _WIN32 - // Add branding/data to VirtFS search path + // Add branding file's possibly adjecent data/ to VirtFS search path if (!settings.options.brandingPath.empty()) { 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) - { - VirtFs::mountDir(path.substr( - 0, loc + 1).append("data"), - Append_false); - } + VirtFs::mountDir(path.substr(0, loc + 1).append("data"), + Append_false); } #endif // _WIN32 } |