marble/client/init.cs

@@ -83,14 +83,12 @@ 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");
    exec("./ui/ExitGameDlg.gui");
    exec("./ui/MiniShotGui.gui");
-   // custom gui files
-   exec("./ui/congratsGui.gui");
 
    // Client scripts
    exec("./scripts/client.cs");
@@ -106,7 +104,7 @@ function initClient()
    exec("./scripts/centerPrint.cs");
    exec("./scripts/game.cs");
    exec("./scripts/version.cs");
-   // custom gui scripts
+   // custom guis
    exec("./scripts/MarbleSkinSelectionDlg.cs");
 
    // Default player key bindings

marble/client/scripts/game.cs

@@ -33,11 +33,6 @@ function clientCmdGameEnd()
       return;
 
    getBestTimes($Server::MissionFile);
-   if($Server::MissionFile $= "marble/data/missions/expert/timmysfork.mis") {
-      // if we've beaten The Final Challenge show the epic finale
-      gameIsCompleteSignalForEndGameGui(1);
-      Canvas.pushDialog(congratsGui);
-   }
    $highScoreIndex = "";
    for(%i = 0; %i < 3; %i++)
    {

marble/client/ui/congratsGui.gui

@@ -1,38 +0,0 @@
-new GuiChunkedBitmapCtrl(congratsGui) {
-	profile = "GuiContentProfile";
-	horizSizing = "width";
-	vertSizing = "height";
-	position = "0 0";
-	extent = "640 480";
-	minExtent = "8 8";
-	visible = "1";
-	helpTag = "0";
-	bitmap = "./congrats.jpg";
-	useVariable = "0";
-	tile = "0";
-
-	new GuiBitmapButtonCtrl() {
-		profile = "GuiButtonProfile";
-		horizSizing = "center";
-		vertSizing = "top";
-		position = "280 415";
-        extent = "111 59";
-		minExtent = "8 8";
-		visible = "1";
-		command = "setPlayMissionGui();gameIsCompleteSignalForEndGameGui(0);";
-		accelerator = "escape";
-		helpTag = "0";
-		text = "play";
-		groupNum = "-1";
-		buttonType = "PushButton";
-		bitmap = "./play/play";
-	};
-};
-
-function congratsGui::onWake() {
-   if (!alxIsPlaying($WinSoundHandle))
-   {
-      $WinSoundHandle = alxCreateSource("AudioChannel0", expandFilename("~/data/sound/congrats.wav"));
-      alxPlay($WinSoundHandle);
-   }
-}

marble/client/ui/endGameGui.gui

@@ -36,7 +36,7 @@ new GuiControl(EndGameGui) {
          allowColorChars = "0";
          maxChars = "-1";
       };
-      new GuiBitmapButtonCtrl(EndGameContinueButton) {
+      new GuiBitmapButtonCtrl() {
          profile = "GuiButtonProfile";
          horizSizing = "right";
          vertSizing = "bottom";
@@ -70,11 +70,3 @@ new GuiControl(EndGameGui) {
    };
 };
 //--- OBJECT WRITE END ---
-
-function gameIsCompleteSignalForEndGameGui(%probably) {
-	if(%probably) {
-		EndGameContinueButton.command = "Canvas.popDialog(EndGameGui);";
-	} else {
-		EndGameContinueButton.command = "setPlayMissionGui();";
-	}
-}