summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/example.manaverse (renamed from docs/example.manaplus)4
-rw-r--r--src/commandline.cpp9
-rw-r--r--src/dirs.cpp2
-rw-r--r--src/fs/files.cpp2
-rw-r--r--src/fs/paths.cpp4
-rw-r--r--src/game.cpp4
-rw-r--r--src/graphicsmanager.cpp2
-rw-r--r--src/gui/windowmanager.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp22
-rw-r--r--src/gui/windows/updaterwindow.h4
-rw-r--r--src/logger.cpp8
-rw-r--r--src/main.h6
-rw-r--r--src/manaverse.rc (renamed from src/manaplus.rc)0
-rw-r--r--src/mumblemanager.cpp4
-rw-r--r--src/net/ea/loginrecv.cpp2
-rw-r--r--src/net/eathena/loginrecv.cpp2
-rw-r--r--src/resources/mapreader.cpp2
-rw-r--r--src/test/testmain.cpp2
-rw-r--r--src/utils/gettexthelper.cpp8
-rw-r--r--src/utils/translation/translationmanager.cpp2
-rw-r--r--src/winver.h.in3
21 files changed, 48 insertions, 46 deletions
diff --git a/docs/example.manaplus b/docs/example.manaverse
index 2a580463f..93f8b1f42 100644
--- a/docs/example.manaplus
+++ b/docs/example.manaverse
@@ -9,9 +9,9 @@ filename / path as a command line parameter
-->
<configuration>
- <option name="appName" value="ManaPlus"/>
+ <option name="appName" value="ManaVerse"/>
<option name="appShort" value="mana"/>
- <option name="appIcon" value="icons/manaplus"/>
+ <option name="appIcon" value="icons/manaverse"/>
<option name="loginMusic" value="Magick - Real.ogg"/>
<option name="onlineServerList" value="http://manasource.org/serverlist.xml"/>
<option name="defaultServer" value="server.themanaworld.org"/>
diff --git a/src/commandline.cpp b/src/commandline.cpp
index daa147f2f..f5f30fa4a 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -42,16 +42,17 @@ 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)") <<
+ _("[manaverse-file] : The manaverse file is an XML file "
+ "(.manaverse)") <<
std::endl <<
// TRANSLATORS: command line help
_(" used to set custom parameters") <<
std::endl <<
// TRANSLATORS: command line help
- _(" to the manaplus client.") <<
+ _(" to the manaverse client.") <<
std::endl << std::endl <<
// TRANSLATORS: command line help
_("Options:") <<
@@ -134,7 +135,7 @@ static void printHelp()
static void printVersion()
{
std::cout <<
- strprintf("ManaPlus client %s", FULL_VERSION) <<
+ strprintf("ManaVerse client %s", FULL_VERSION) <<
std::endl;
}
diff --git a/src/dirs.cpp b/src/dirs.cpp
index 2f48daf51..5fc5e1d31 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -420,7 +420,7 @@ void Dirs::initConfigDir()
}
#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");
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 1dcbb9962..9cd3bfb0e 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -60,7 +60,7 @@ void Files::extractLocale()
const std::string dir = pathJoin("locale", *i);
if (VirtFs::isDirectory(dir))
{
- const std::string moFile = dir + "/LC_MESSAGES/manaplus.mo";
+ const std::string moFile = dir + "/LC_MESSAGES/manaverse.mo";
if (VirtFs::exists((moFile)))
{
const std::string localFile = pathJoin(localDir, moFile);
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index 76dba99f3..5388438c8 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -172,13 +172,13 @@ std::string removeLast(const std::string &str)
#ifdef WIN32
std::string getSelfName()
{
- return "manaplus.exe";
+ return "manaverse.exe";
}
#elif defined(__APPLE__)
std::string getSelfName()
{
- return "manaplus.exe";
+ return "manaverse.exe";
}
#elif defined __linux__ || defined __linux
diff --git a/src/game.cpp b/src/game.cpp
index 3e785425c..3f2d525c5 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -589,13 +589,13 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot,
if (serverName.empty())
{
screenShortStr = strprintf("%s_Screenshot_%s_",
- branding.getValue("appName", "ManaPlus").c_str(),
+ branding.getValue("appName", "ManaVerse").c_str(),
buffer);
}
else
{
screenShortStr = strprintf("%s_Screenshot_%s_%s_",
- branding.getValue("appName", "ManaPlus").c_str(),
+ branding.getValue("appName", "ManaVerse").c_str(),
serverName.c_str(), buffer);
}
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 89a2e4eee..e43f701b3 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -623,7 +623,7 @@ SDL_Window *GraphicsManager::createWindow(const int w, const int h,
const int bpp A_UNUSED,
const int flags)
{
- return SDL_CreateWindow("ManaPlus", SDL_WINDOWPOS_UNDEFINED,
+ return SDL_CreateWindow("ManaVerse", SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, w, h, flags);
}
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 58fb88268..352f06155 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -418,7 +418,7 @@ void WindowManager::newChatMessage()
void WindowManager::setIcon()
{
#if !defined(ANDROID) && !defined(__SWITCH__)
- std::string iconFile = branding.getValue("appIcon", "icons/manaplus");
+ std::string iconFile = branding.getValue("appIcon", "icons/manaverse");
#ifdef WIN32
iconFile.append(".ico");
#else // WIN32
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index a402967d7..040085b4b 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -461,7 +461,7 @@ void UpdaterWindow::loadPatch()
if (line != nullptr)
{
mBrowserBox->addRow(strprintf("##9 Latest client version: "
- "##6ManaPlus %s##0", line), true);
+ "##6ManaVerse %s##0", line), true);
}
}
if (version > CHECK_VERSION)
@@ -483,11 +483,11 @@ void UpdaterWindow::loadPatch()
branding.getStringValue(url)).append("|").append(
branding.getStringValue(text)).append("@@]"), true);
mBrowserBox->addRow("##1You can download it from", true);
- mBrowserBox->addRow("##1ManaPlus updated.", true);
+ mBrowserBox->addRow("##1ManaVerse updated.", true);
}
else
{
- mBrowserBox->addRow("You have latest client version.", true);
+ mBrowserBox->addRow("You have the latest client version.", true);
}
}
@@ -681,7 +681,7 @@ void UpdaterWindow::loadUpdates()
file.name,
Append_false);
}
- loadManaPlusUpdates(mUpdatesDir);
+ loadManaVerseUpdates(mUpdatesDir);
loadMods(mUpdatesDir, mUpdateFiles);
}
@@ -714,7 +714,7 @@ void UpdaterWindow::loadLocalUpdates(const std::string &dir)
file.name,
Append_false);
}
- loadManaPlusUpdates(dir);
+ loadManaVerseUpdates(dir);
loadMods(dir, updateFiles);
}
@@ -740,10 +740,10 @@ void UpdaterWindow::unloadUpdates(const std::string &dir)
fixPath,
updateFiles[updateIndex].name);
}
- unloadManaPlusUpdates(dir);
+ unloadManaVerseUpdates(dir);
}
-void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
+void UpdaterWindow::loadManaVerseUpdates(const std::string &dir)
{
std::string fixPath = dir + "/fix";
STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
@@ -759,7 +759,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
if (!file.group.empty())
continue;
const std::string name = file.name;
- if (strStartWith(name, "manaplus_"))
+ if (strStartWith(name, "manaverse_"))
{
struct stat statbuf;
std::string fileName = pathJoin(fixPath,
@@ -773,7 +773,7 @@ void UpdaterWindow::loadManaPlusUpdates(const std::string &dir)
}
}
-void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir)
+void UpdaterWindow::unloadManaVerseUpdates(const std::string &dir)
{
const std::string fixPath = dir + "/fix";
const STD_VECTOR<UpdateFile> updateFiles = loadXMLFile(
@@ -786,7 +786,7 @@ void UpdaterWindow::unloadManaPlusUpdates(const std::string &dir)
updateIndex++)
{
std::string name = updateFiles[updateIndex].name;
- if (strStartWith(name, "manaplus_"))
+ if (strStartWith(name, "manaverse_"))
{
struct stat statbuf;
const std::string file = pathJoin(
@@ -1147,7 +1147,7 @@ void UpdaterWindow::loadMods(const std::string &dir,
if (file.group.empty())
continue;
std::string name = file.name;
- if (strStartWith(name, "manaplus_"))
+ if (strStartWith(name, "manaverse_"))
{
const std::set<std::string>::const_iterator
it = modsList.find(file.group);
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 97ebc96c1..adb5fe131 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -131,9 +131,9 @@ class UpdaterWindow final : public Window,
const std::string &restrict fixPath,
const std::string &filerestrict);
- static void loadManaPlusUpdates(const std::string &dir);
+ static void loadManaVerseUpdates(const std::string &dir);
- static void unloadManaPlusUpdates(const std::string &dir);
+ static void unloadManaVerseUpdates(const std::string &dir);
static unsigned long getFileHash(const std::string &filePath);
diff --git a/src/logger.cpp b/src/logger.cpp
index ee95a85fe..f36d8cacd 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -51,14 +51,14 @@
#if defined(__ANDROID__)
#include <android/log.h>
#ifdef SPECIAL_LOGGING
-#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaplus", x);
+#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaverse", x);
#define DSPECIALLOG(x) __android_log_print(ANDROID_LOG_VERBOSE, \
- "manaplus", x);
+ "manaverse", x);
#else // SPECIAL_LOGGING
#define SPECIALLOG(x) if (mDebugLog) \
- __android_log_print(ANDROID_LOG_INFO, "manaplus", x);
+ __android_log_print(ANDROID_LOG_INFO, "manaverse", x);
#define DSPECIALLOG(x) if (mDebugLog) \
- __android_log_print(ANDROID_LOG_VERBOSE, "manaplus", x);
+ __android_log_print(ANDROID_LOG_VERBOSE, "manaverse", x);
#endif // SPECIAL_LOGGING
#elif defined __native_client__
#ifdef SPECIAL_LOGGING
diff --git a/src/main.h b/src/main.h
index 9b8d108a7..b08f1fcd7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -158,10 +158,10 @@
#define SIMD_NAME ""
#endif // SIMD_SUPPORTED
-#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
-"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; 4144 v" SMALL_VERSION ")"
+#define PACKAGE_EXTENDED_VERSION "ManaVerse (" PACKAGE_OS \
+"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; jak1 v" SMALL_VERSION ")"
-#define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS ", " \
+#define FULL_VERSION "ManaVerse " SMALL_VERSION " " PACKAGE_OS ", " \
SDL_NAME ", " XML_NAME SIMD_NAME
#ifdef ANDROID
diff --git a/src/manaplus.rc b/src/manaverse.rc
index 57de91dbb..57de91dbb 100644
--- a/src/manaplus.rc
+++ b/src/manaverse.rc
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 6c9b853a8..bc620e57f 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -147,8 +147,8 @@ void MumbleManager::init()
#endif // WIN32
- wcsncpy(mLinkedMemCache.name, L"ManaPlus", 256);
- wcsncpy(mLinkedMemCache.description, L"ManaPlus Plugin", 2048);
+ wcsncpy(mLinkedMemCache.name, L"ManaVerse", 256);
+ wcsncpy(mLinkedMemCache.description, L"ManaVerse Plugin", 2048);
mLinkedMemCache.uiVersion = 2;
// Left handed coordinate system.
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 5902a7978..574f80faa 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -97,7 +97,7 @@ void LoginRecv::processLoginError(Net::MessageIn &msg)
case 5:
// TRANSLATORS: error message
errorMessage = _("Client too old or wrong server type.\n"
- "Please update client on http://manaplus.org");
+ "Please update client on https://manaverse.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 249ef46ea..41af09fa8 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -90,7 +90,7 @@ void LoginRecv::processLoginError2(Net::MessageIn &msg)
case 5:
// TRANSLATORS: error message
errorMessage = _("Client too old or wrong server type.\n"
- "Please update client on http://manaplus.org");
+ "Please update client on https://manaverse.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 885b65e11..90109eb04 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -413,7 +413,7 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path)
{
readProperties(childNode, map);
map->setVersion(atoi(map->getProperty(
- "manaplus version", std::string()).c_str()));
+ "manaverse version", std::string()).c_str()));
}
else if (xmlNameEqual(childNode, "objectgroup"))
{
diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp
index 1ca8adb1e..a7aa5fae1 100644
--- a/src/test/testmain.cpp
+++ b/src/test/testmain.cpp
@@ -44,7 +44,7 @@ TestMain::TestMain() :
mConfig()
{
fileName = getSelfName();
- log->setLogFile(pathJoin(settings.localDataDir, "manaplustest.log"));
+ log->setLogFile(pathJoin(settings.localDataDir, "manaversetest.log"));
}
TestMain::~TestMain()
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 33b366ad1..61a413866 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -108,7 +108,7 @@ void GettextHelper::initLang()
#else // ENABLE_PORTABLE
#ifdef __APPLE__
bindTextDomain((std::string(VirtFs::getBaseDir())
- .append("ManaPlus.app/Contents/Resources/locale/")).c_str());
+ .append("ManaVerse.app/Contents/Resources/locale/")).c_str());
#else // __APPLE__
bindTextDomain(LOCALEDIR);
@@ -130,8 +130,8 @@ void GettextHelper::initLang()
else
logger->log("locale empty");
}
- bind_textdomain_codeset("manaplus", "UTF-8");
- textdomain("manaplus");
+ bind_textdomain_codeset("manaverse", "UTF-8");
+ textdomain("manaverse");
#elif defined(ENABLE_CUSTOMNLS)
mainTranslator = new PoDict("en");
setLangEnv();
@@ -141,7 +141,7 @@ void GettextHelper::initLang()
#ifdef ENABLE_NLS
void GettextHelper::bindTextDomain(const char *const path)
{
- const char *const dir = bindtextdomain("manaplus", path);
+ const char *const dir = bindtextdomain("manaverse", path);
if (dir)
logger->log("bindtextdomain: %s", dir);
else
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index e75ef4857..49cadaf63 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -61,7 +61,7 @@ void TranslationManager::loadDictionaryLang()
void TranslationManager::loadGettextLang()
{
delete mainTranslator;
- mainTranslator = loadLang(getLang(), "manaplus/", nullptr);
+ mainTranslator = loadLang(getLang(), "manaverse/", nullptr);
}
#endif // ENABLE_CUSTOMNLS
diff --git a/src/winver.h.in b/src/winver.h.in
index 078b7a33f..19a613aed 100644
--- a/src/winver.h.in
+++ b/src/winver.h.in
@@ -1,6 +1,7 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012-2017 The ManaPlus Developers
+ * Copyright (C) 2012-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-21 17:04:22 +0000