foxygit / doom Log in
commit 70e494cff6500a0619f786a0de4c40f5c16e4dde
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Aug 31 18:14:22 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Aug 31 18:14:22 2006 +0000

    Change the 'abort' button to a quit button on the main menu. Change the
    confirmation dialog to use 'abort'. Working 'start network game' button.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 585
---
 setup/mainmenu.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 2167bb4d..62e20e89 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -34,10 +34,10 @@ void QuitConfirm(void *unused1, void *unused2)

     button = TXT_NewButton("  No   ");

-    // Only an "escape" button in the middle.
+    // Only an "abort" button in the middle.
     TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
     TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
-                        TXT_NewWindowEscapeAction(window));
+                        TXT_NewWindowAbortAction(window));
     TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);

     TXT_SetWidgetAlign(button, TXT_HORIZ_CENTER);
@@ -48,6 +48,7 @@ void QuitConfirm(void *unused1, void *unused2)
 extern void ConfigDisplay();
 extern void ConfigKeyboard();
 extern void ConfigMouse();
+extern void StartMultiGame();

 void MainMenu(void)
 {
@@ -71,10 +72,14 @@ void MainMenu(void)

     TXT_AddWidget(window, TXT_NewButton("Save parameters and launch DOOM"));
     TXT_AddWidget(window, TXT_NewStrut(0, 1));
-    TXT_AddWidget(window, TXT_NewButton("Start a Network game"));
+
+    button = TXT_NewButton("Start a Network game");
+    TXT_SignalConnect(button, "pressed", StartMultiGame, NULL);
+    TXT_AddWidget(window, button);
+
     TXT_AddWidget(window, TXT_NewButton("Join a Network game"));

-    quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Abort");
+    quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Quit");
     TXT_SignalConnect(quit_action, "pressed", QuitConfirm, NULL);
     TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action);
 }