From 4ecd19e20c603816b48921cfa4c3d717d0b99936 Mon Sep 17 00:00:00 2001 From: yellows111 Date: Mon, 11 Mar 2024 17:58:51 +0000 Subject: [PATCH] reintroduce MOTD/version check now that we have the content for it --- marble/client/init.cs | 2 +- marble/client/scripts/version.cs | 2 +- marble/client/ui/MOTDGui.gui | 2 +- marble/client/ui/mainMenuGui.gui | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/marble/client/init.cs b/marble/client/init.cs index a6cd586..0482ecf 100644 --- a/marble/client/init.cs +++ b/marble/client/init.cs @@ -83,7 +83,7 @@ function initClient() exec("./ui/loadingGui.gui"); exec("./ui/optionsDlg.gui"); exec("./ui/remapDlg.gui"); - //exec("./ui/MOTDGui.gui"); + exec("./ui/MOTDGui.gui"); exec("./ui/EnterNameDlg.gui"); EnterNameDlg.preload(); exec("./ui/HelpCreditsGui.gui"); diff --git a/marble/client/scripts/version.cs b/marble/client/scripts/version.cs index 0f42912..a05721e 100644 --- a/marble/client/scripts/version.cs +++ b/marble/client/scripts/version.cs @@ -10,7 +10,7 @@ function startVersionCheck() if($pref::checkMOTDAndVersion) { new HTTPObject ( Version ); - Version.get("kevinthe.horse", "/kevinblast/index.html"); + Version.get("kevinthe.horse:80", "/kevinblast/version.html"); echo("Checking Server Version"); } } diff --git a/marble/client/ui/MOTDGui.gui b/marble/client/ui/MOTDGui.gui index 38c0416..b06c885 100644 --- a/marble/client/ui/MOTDGui.gui +++ b/marble/client/ui/MOTDGui.gui @@ -148,7 +148,7 @@ function startMotdCheck() if($pref::checkMOTDAndVersion) { new HTTPObject ( MOTD ); - MOTD.get("www.garagegames.com:80", "/marbleblast/motd.html"); + MOTD.get("kevinthe.horse:80", "/kevinblast/motd.html"); echo("Checking for a message of the day"); } } diff --git a/marble/client/ui/mainMenuGui.gui b/marble/client/ui/mainMenuGui.gui index f4db84a..6dea284 100644 --- a/marble/client/ui/mainMenuGui.gui +++ b/marble/client/ui/mainMenuGui.gui @@ -97,6 +97,21 @@ new GuiChunkedBitmapCtrl(MainMenuGui) { bitmap = "./home/exit"; }; }; + new GuiBitmapButtonCtrl(MOTDButton) { + profile = "GuiButtonProfile"; + horizSizing = "left"; + vertSizing = "top"; + position = "529 387"; + extent = "106 85"; + minExtent = "8 8"; + visible = "1"; + command = "StopDemoTimer(); showMotd();"; + helpTag = "0"; + text = "play"; + groupNum = "-1"; + buttonType = "PushButton"; + bitmap = "./motd/motd_buttn"; + }; }; //--- OBJECT WRITE END ---