Continue what we started; But preserve more of the hardcoded stuff

(Including manaplus.exe - no renaming Windows build I guess)

12 files changed, 17 insertions, 17 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c2eab0c34..d7ce3f445 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2184,13 +2184,13 @@ IF (WIN32)
         ${SRCS}
         fs/specialfolder.cpp
         fs/specialfolder.h
-        manaverse.rc
+        manaplus.rc
     )
     SET(DYE_CMD_SRCS
         ${DYE_CMD_SRCS}
         fs/specialfolder.cpp
         fs/specialfolder.h
-        manaverse.rc
+        manaplus.rc
     )
 ENDIF ()
 
diff --git a/src/Makefile.am b/src/Makefile.am
index adb75da54..3ef184ddc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,8 +170,8 @@ dyecmd_SOURCES += debug/mse/msemsevector.h \
 endif
 
 if MINGW
-manaplus_SOURCES += manaverse.rc
-dyecmd_SOURCES += manaverse.rc
+manaplus_SOURCES += manaplus.rc
+dyecmd_SOURCES += manaplus.rc
 endif
 
 dyecmd_CXXFLAGS += -DDYECMD
@@ -2192,7 +2192,7 @@ manaversetests_SOURCES += \
 endif
 
 if MINGW
-manaversetests_SOURCES += manaverse.rc
+manaversetests_SOURCES += manaplus.rc
 manaversetests_LDFLAGS += -mconsole
 endif
 
@@ -2253,7 +2253,7 @@ endif
 
 EXTRA_DIST = CMakeLists.txt \
 	     winver.h.in \
-	     manaverse.rc \
+	     manaplus.rc \
 	     SDLMain.m
 
 # set the include path found by configure
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index cc5092c69..93ead2200 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -171,13 +171,13 @@ std::string removeLast(const std::string &str)
 #ifdef WIN32
 std::string getSelfName()
 {
-    return "manaverse.exe";
+    return "manaplus.exe";
 }
 
 #elif defined(__APPLE__)
 std::string getSelfName()
 {
-    return "manaverse.exe";
+    return "manaplus.exe";
 }
 
 #elif defined __linux__ || defined __linux
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 9d2e2219c..fe33b89c2 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -88,7 +88,7 @@ Desktop::Desktop(const Widget2 *const widget) :
             false);
     }
     mVersionLabel->addRow("copyright",
-        "(C) ManaVerse developers, http://manaplus.org");
+        "(C) ManaVerse developers, http://manaplus.germantmw.de");
     mVersionLabel->setLinkHandler(this);
     mVersionLabel->updateHeight();
 }
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 26c522e0e..6e8f6dbce 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -467,7 +467,7 @@ void ServerDialog::downloadServerList()
     // Fall back to manaplus.germantmw.de when neither branding
     // nor config set it
     if (listFile.empty())
-        listFile = "http://manaplus.org/serverlist.xml";
+        listFile = "http://manaplus.germantmw.de/serverlist.xml";
 
     if (mDownload != nullptr)
     {
diff --git a/src/manaplus.rc b/src/manaplus.rc
index 5a56dcc0e..6ec5642ff 100644
--- a/src/manaplus.rc
+++ b/src/manaplus.rc
@@ -17,7 +17,7 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
             VALUE "FileVersion", PACKAGE_VERSION "4144"
             VALUE "FileDescription", "ManaVerse"
             VALUE "LegalCopyright", "2004-2014 (C)"
-            VALUE "OriginalFilename", "manaverse.exe"
+            VALUE "OriginalFilename", "manaplus.exe"
             VALUE "ProductName", "ManaVerse MMORPG Client"
             VALUE "ProductVersion", PACKAGE_VERSION "4144"
         }
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 6e434ae8c..9760b09a6 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -96,7 +96,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 http://manaplus.germantmw.de");
             break;
         case 6:
             // TRANSLATORS: error message
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 61983556b..ce7c0dcd9 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -89,7 +89,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 http://manaplus.germantmw.de");
             break;
         case 6:
             // TRANSLATORS: error message
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index d43f6eb98..b0c4cabb3 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -193,7 +193,7 @@ void Client::gameInit()
     else
     {
         settings.logFileName = pathJoin(settings.localDataDir,
-            "manaverse.log");
+            "manaplus.log");
     }
     logger->setLogFile(settings.logFileName);
 
diff --git a/src/progs/manaplus/client.cpp b/src/progs/manaplus/client.cpp
index 355a91602..70f31448a 100644
--- a/src/progs/manaplus/client.cpp
+++ b/src/progs/manaplus/client.cpp
@@ -311,7 +311,7 @@ void Client::gameInit()
     else
     {
         settings.logFileName = pathJoin(settings.localDataDir,
-            "manaverse.log");
+            "manaplus.log");
     }
     logger->log("Log file: " + settings.logFileName);
     logger->setLogFile(settings.logFileName);
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 8e1f31252..7d1442a75 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -169,7 +169,7 @@ void MobileOpenGL2Graphics::postInit() restrict2
     if (mProgram == nullptr)
     {
         graphicsManager.logError();
-        logger->safeError("Shader creation error. See manaverse.log.");
+        logger->safeError("Shader creation error. See manaplus.log.");
     }
     mProgramId = mProgram->getProgramId();
     if (mProgramId == 0U)
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index 17c05aec3..de250ab34 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -174,7 +174,7 @@ void ModernOpenGLGraphics::postInit() restrict2
     if (mProgram == nullptr)
     {
         graphicsManager.logError();
-        logger->safeError("Shader creation error. See manaverse.log.");
+        logger->safeError("Shader creation error. See manaplus.log.");
     }
     mProgramId = mProgram->getProgramId();
     if (mProgramId == 0U)