diff options
| -rwxr-xr-x | build/update-creator.sh | 2 | ||||
| -rw-r--r-- | data/tmw/Makefile.am | 4 | ||||
| -rw-r--r-- | data/tmw/tmw.desktop.in | 2 | ||||
| -rwxr-xr-x | data/tmw/tmw.in | 2 | ||||
| -rw-r--r-- | data/tmw/tmw.mana (renamed from data/tmw/tmw.manaplus) | 0 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/example.mana (renamed from docs/example.manaplus) | 0 | ||||
| -rw-r--r-- | packaging/windows/setup.nsi | 4 | ||||
| -rw-r--r-- | src/commandline.cpp | 5 | ||||
| -rw-r--r-- | src/dirs.cpp | 11 |
10 files changed, 15 insertions, 17 deletions
diff --git a/build/update-creator.sh b/build/update-creator.sh index f3fc9e28c..85268efb1 100755 --- a/build/update-creator.sh +++ b/build/update-creator.sh @@ -7,5 +7,5 @@ find -name \*.cpp \ -o -name \*.am \ -o -name \*.txt \ -o -name \*.xml \ - -o -name \*.manaplus \ + -o -name \*.mana \ | sort > manaplus.files diff --git a/data/tmw/Makefile.am b/data/tmw/Makefile.am index f8135b488..7bd9ab0f9 100644 --- a/data/tmw/Makefile.am +++ b/data/tmw/Makefile.am @@ -6,14 +6,14 @@ branding: mkdir -p "$(DESTDIR)$(datarootdir)/icons" mkdir -p "$(DESTDIR)$(desktopdir)" cp tmw.desktop "$(DESTDIR)$(desktopdir)" - cp tmw.manaplus "$(DESTDIR)$(pkgdatadir)/data/tmw" + cp tmw.mana "$(DESTDIR)$(pkgdatadir)/data/tmw" cp icons/tmw-client.png "$(DESTDIR)$(pkgdatadir)/data/tmw/icons/tmw.png" cp icons/tmw-client.png "$(DESTDIR)$(datarootdir)/icons/tmw.png" cp -r images "$(DESTDIR)$(pkgdatadir)/data/tmw" EXTRA_DIST = tmw.desktop.in \ tmw.in \ - tmw.manaplus \ + tmw.mana \ icons/tmw-client.ico \ icons/tmw-client.png \ icons/tmw-client.xpm \ diff --git a/data/tmw/tmw.desktop.in b/data/tmw/tmw.desktop.in index 358877af0..add172fc6 100644 --- a/data/tmw/tmw.desktop.in +++ b/data/tmw/tmw.desktop.in @@ -8,7 +8,7 @@ Comment[de]=ein Online Fantasy Spiel Comment[it]=Un gioco fantasy online Comment[nl]=Een online role playing game Comment[sv]=Ett fantasyrollspel online -Exec=manaplus @datadir@/manaplus/data/tmw/tmw.manaplus +Exec=manaplus @datadir@/manaplus/data/tmw/tmw.mana StartupNotify=false Terminal=false Type=Application diff --git a/data/tmw/tmw.in b/data/tmw/tmw.in index d726db2c3..9038225d1 100755 --- a/data/tmw/tmw.in +++ b/data/tmw/tmw.in @@ -1,2 +1,2 @@ #!/bin/sh -exec manaplus @datadir@/manaplus/data/tmw/tmw.manaplus "$@" +exec manaplus @datadir@/manaplus/data/tmw/tmw.mana "$@" diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.mana index c4b66237e..c4b66237e 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.mana diff --git a/docs/Makefile.am b/docs/Makefile.am index 91cfe1242..60c1575ad 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -8,4 +8,4 @@ EXTRA_DIST = $(man6_MANS) \ SOURCE/Doxyfile \ sounddev.txt \ clientupdates.txt \ - example.manaplus + example.mana diff --git a/docs/example.manaplus b/docs/example.mana index e39ab42d3..e39ab42d3 100644 --- a/docs/example.manaplus +++ b/docs/example.mana diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 9eaf66346..98cda62ef 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -362,7 +362,7 @@ Section "Create Shortcuts" SecShortcuts CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe" CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests - ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" + ${registerExtension} "$INSTDIR\manaplus.exe" ".mana" "ManaVerse branding" SectionEnd Section /o "Portable" SecPortable @@ -472,6 +472,6 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey SHCTX "${PRODUCT_DIR_REGKEY}" - ${unregisterExtension} ".manaplus" "ManaPlus brandings" + ${unregisterExtension} ".mana" "ManaVerse branding" SetAutoClose true SectionEnd 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 } |