Links are now in glest.ini

This commit is contained in:
mathusummut
2019-03-29 02:13:07 +01:00
parent ad19e35a5f
commit 0037df1100
8 changed files with 25 additions and 27 deletions

View File

@@ -36,8 +36,6 @@ using namespace Shared::Util;
using namespace Shared::Platform;
namespace Game {
const char *mailString = "https://github.com/Glest";
string getCrashDumpFileName() {
return "glest.dmp";
}
@@ -184,11 +182,11 @@ namespace Game {
string getAboutString2(int i) {
switch (i) {
case 0:
return "Website: https://glest.io";
return "Website: " + Config::getInstance().getString("Website", "https://glest.io");
case 1:
return "Discord: https://discord.gg/WaAaXS7";
return "Join Us: " + Config::getInstance().getString("JoinUs", "https://discord.gg/es3EyBB");
case 2:
return "Bug reports: " + string(mailString);
return "Bug reports: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues");
}
return "";
}

View File

@@ -33,8 +33,6 @@
using std::string;
namespace Game {
extern const char *mailString;
void initSpecialStrings();
string getCrashDumpFileName();
string getPlatformTypeNameString();

View File

@@ -707,7 +707,7 @@ namespace Game {
string
msg =
"#1 An error occurred and " + string(appNameString) +
" will close.\nPlease report this bug to: " + string(mailString);
" will close.\nPlease report this bug to: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues");
msg +=
", attaching the generated " + getCrashDumpFileName() + " file.";
@@ -733,7 +733,7 @@ namespace Game {
string
msg =
"#1 An error occurred and " + string(appNameString) +
" will close.\nPlease report this bug to: " + string(mailString);
" will close.\nPlease report this bug to: " + Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues");
#ifdef WIN32
msg +=
", attaching the generated " + getCrashDumpFileName() + " file.";
@@ -5719,7 +5719,7 @@ namespace Game {
PlatformExceptionHandler::application_binary =
executable_path(argv[0], true);
appNameString = GameConstants::application_name;
mailStringSupport = mailString;
mailStringSupport = Config::getInstance().getString("BugReportUrl", "https://github.com/Glest/glest-source/issues");
SystemFlags::ENABLE_THREADED_LOGGING = false;
disableBacktrace = false;
bool