summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2024-02-16 16:40:35 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2024-02-16 16:40:35 +0000
commit775392e472933be8d1d76619894efc0671f0c02d (patch)
treecacf9d24264315d12c7983ae3b176ad7c67bdddf /src
parent0144ab308fed93b96b3a819dfe7d9940ee9eedb9 (diff)
downloadmv-775392e472933be8d1d76619894efc0671f0c02d.tar.gz
mv-775392e472933be8d1d76619894efc0671f0c02d.tar.bz2
mv-775392e472933be8d1d76619894efc0671f0c02d.tar.xz
mv-775392e472933be8d1d76619894efc0671f0c02d.zip
Client rebranding: Partly import changes from !28
Co-Authored-By: jak1 <jak1@themanaworld.org> Co-Authored-By: jesusalva <jesusalva@themanaworld.org> Co-Authored-By: Fedja Beader <fedja@protonmail.ch>
Diffstat (limited to 'src')
-rw-r--r--src/commandline.cpp5
-rw-r--r--src/commandline.h3
-rw-r--r--src/defaults.cpp10
-rw-r--r--src/graphicsmanager.cpp5
-rw-r--r--src/gui/widgets/desktop.cpp5
-rw-r--r--src/gui/windows/chatwindow.cpp6
-rw-r--r--src/gui/windows/updaterwindow.cpp9
-rw-r--r--src/mumblemanager.cpp7
-rw-r--r--src/net/ea/loginrecv.cpp5
-rw-r--r--src/net/eathena/loginrecv.cpp5
10 files changed, 36 insertions, 24 deletions
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 507cc91f6..982078635 100644
--- a/src/commandline.cpp
+++ b/src/commandline.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.
*
@@ -133,7 +134,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/commandline.h b/src/commandline.h
index af8e6b9fd..1f7c1e63a 100644
--- a/src/commandline.h
+++ b/src/commandline.h
@@ -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.
*
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 000cf1ae4..0cdcf898f 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -1,7 +1,8 @@
/*
* The ManaPlus Client
* Copyright (C) 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.
*
@@ -534,10 +535,9 @@ void setBrandingDefaults(Configuration &cfg)
AddDEF("androidDownloadUrl", "https://play.google.com/store/apps/details"
"?id=org.evolonline.beta.manaplus");
AddDEF("androidDownloadText", "Google Play");
- AddDEF("otherDownloadUrl", "https://manaplus.germantmw.de/");
- AddDEF("otherDownloadText", "https://manaplus.germantmw.de/");
- AddDEF("windowsDownloadUrl", "https://manaplus.germantmw.de/"
- "manaplus/package/windows32/");
+ AddDEF("otherDownloadUrl", "https://manaverse.germantmw.de/");
+ AddDEF("otherDownloadText", "https://manaverse.germantmw.de/");
+ AddDEF("windowsDownloadUrl", "https://updates.tmw2.org/mana/windows/");
AddDEF("windowsDownloadText", "download here");
AddDEF("updateMirror1", "https://manaplus.germantmw.de/manaplus/updates/");
AddDEF("updateMirror2", "");
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 0209e1eb8..e43f701b3 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -1,6 +1,7 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012-2019 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.
*
@@ -622,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/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index e8a728327..6fe317353 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -1,7 +1,8 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana World Development Team
- * 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.
*
@@ -88,7 +89,7 @@ Desktop::Desktop(const Widget2 *const widget) :
false);
}
mVersionLabel->addRow("copyright",
- "(C) ManaPlus developers, http://manaplus.org");
+ "(C) ManaVerse developers, https://manaverse.germantmw.de");
mVersionLabel->setLinkHandler(this);
mVersionLabel->updateHeight();
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0d52dad14..a3b777655 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.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.
*
@@ -1662,11 +1663,14 @@ bool ChatWindow::resortChatLog(std::string line,
{
replaceAll(tmpNick, "#", "_");
replaceAll(tmpNick, "%", "_");
+ // we dont care!
+/*
if (Net::getNetworkType() == ServerType::TMWATHENA)
{
// TRANSLATORS: error message
line = _("Broken nick detected: ") + line;
}
+*/
own = ChatMsgType::BY_SERVER;
}
const size_t idx = line.find(": \302\202");
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 283df5ecf..948ce5a17 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.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.
*
@@ -460,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)
@@ -482,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);
}
}
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 4e22f6f9a..bc620e57f 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -4,7 +4,8 @@
* All code listed below is in the public domain and can be used, shared or
* modified freely
*
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*/
#ifdef USE_MUMBLE
@@ -146,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 d11fbcf9e..574f80faa 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.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.
*
@@ -96,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 0bad05fb3..41af09fa8 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.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.
*
@@ -89,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