diff --git a/src/client/Client.cpp b/src/client/Client.cpp index b3589a1f0..dc284af7b 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -118,7 +118,7 @@ void Client::Tick() { if (versionCheckRequest->StatusCode() == 618) { - AddServerNotification({ "Failed to load SSL certificates", ByteString(SCHEME) + "powdertoy.co.uk/FAQ.html" }); + AddServerNotification({ "Failed to load SSL certificates", ByteString::Build(SCHEME, SERVER, "/FAQ.html") }); } try { diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index ee8bc1e9c..55f367684 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -552,7 +552,7 @@ bool GameController::MouseUp(int x, int y, unsigned button, MouseupReason reason } break; case sign::Type::Thread: - Platform::OpenURI(ByteString::Build(SCHEME, "powdertoy.co.uk/Discussions/Thread/View.html?Thread=", str.Substr(3, si.first - 3).ToUtf8())); + Platform::OpenURI(ByteString::Build(SCHEME, SERVER, "/Discussions/Thread/View.html?Thread=", str.Substr(3, si.first - 3).ToUtf8())); break; case sign::Type::Search: OpenSearch(str.Substr(3, si.first - 3)); diff --git a/src/gui/game/IntroText.h b/src/gui/game/IntroText.h index 36f66b9dc..1ad2221a8 100644 --- a/src/gui/game/IntroText.h +++ b/src/gui/game/IntroText.h @@ -76,7 +76,7 @@ inline ByteString IntroText() } else { - sb << "\bgTo use online features such as saving, you need to register at: \brhttps://powdertoy.co.uk/Register.html\n"; + sb << "\bgTo use online features such as saving, you need to register at: \brhttps://" << SERVER << "/Register.html\n"; } sb << "\n\bt" << VersionInfo(); return sb.Build(); diff --git a/src/gui/login/LoginModel.cpp b/src/gui/login/LoginModel.cpp index 3b02cc3fa..b32cc8eca 100644 --- a/src/gui/login/LoginModel.cpp +++ b/src/gui/login/LoginModel.cpp @@ -1,5 +1,6 @@ #include "LoginModel.h" #include "LoginView.h" +#include "Config.h" #include "client/Client.h" #include "client/http/LoginRequest.h" #include "client/http/LogoutRequest.h" @@ -8,7 +9,7 @@ void LoginModel::Login(ByteString username, ByteString password) { if (username.Contains("@")) { - statusText = "Use your Powder Toy account to log in, not your email. If you don't have a Powder Toy account, you can create one at https://powdertoy.co.uk/Register.html"; + statusText = String::Build("Use your Powder Toy account to log in, not your email. If you don't have a Powder Toy account, you can create one at https://", SERVER, "/Register.html"); loginStatus = loginIdle; notifyStatusChanged(); return; diff --git a/src/gui/preview/PreviewModel.cpp b/src/gui/preview/PreviewModel.cpp index 68f43c7ab..42b8bd71c 100644 --- a/src/gui/preview/PreviewModel.cpp +++ b/src/gui/preview/PreviewModel.cpp @@ -147,7 +147,7 @@ void PreviewModel::OnSaveReady() { auto gameSave = std::make_unique(*saveData); if (gameSave->fromNewerVersion) - new ErrorMessage("This save is from a newer version", "Please update TPT in game or at https://powdertoy.co.uk"); + new ErrorMessage("This save is from a newer version", String::Build("Please update TPT in game or at https://", SERVER)); saveInfo->SetGameSave(std::move(gameSave)); } catch(ParseException &e) diff --git a/src/gui/update/UpdateActivity.cpp b/src/gui/update/UpdateActivity.cpp index 33ecf0ecd..6d3ba89f3 100644 --- a/src/gui/update/UpdateActivity.cpp +++ b/src/gui/update/UpdateActivity.cpp @@ -151,7 +151,7 @@ void UpdateActivity::NotifyError(Task * sender) new ConfirmPrompt("Autoupdate failed", sb.Build(), { [this] { if constexpr (!USE_UPDATESERVER) { - Platform::OpenURI(ByteString(SCHEME) + "powdertoy.co.uk/Download.html"); + Platform::OpenURI(ByteString::Build(SCHEME, SERVER, "/Download.html")); } Exit(); }, [this] { Exit(); } });