From 4dc7b33e17069c6559e9b1b7cc1ecd878162f629 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 17 Sep 2011 16:39:27 +0000
Subject: Add multiplayer query code to setup tool, and rework join game
 interface.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2382
---
 src/setup/multiplayer.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/setup/multiplayer.c')

diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index aed89212..b625f056 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -797,7 +797,7 @@ void JoinMultiGame(void)
     TXT_AddWidgets(window, 
         gameopt_table = TXT_NewTable(2),
         TXT_NewSeparator("Server"),
-        serveropt_table = TXT_NewTable(2),
+        serveropt_table = TXT_NewTable(1),
         TXT_NewStrut(0, 1),
         TXT_NewButton2("Add extra parameters...", OpenExtraParamsWindow, NULL),
         NULL);
@@ -819,11 +819,12 @@ void JoinMultiGame(void)
     }
 
     TXT_AddWidgets(serveropt_table,
-                   TXT_NewRadioButton("Connect to address:",
-                                      &jointype, JOIN_ADDRESS),
-                   address_box = TXT_NewInputBox(&connect_address, 30),
-                   TXT_NewRadioButton("Auto-join LAN game",
-                                      &jointype, JOIN_AUTO_LAN),
+                   TXT_NewHorizBox(
+                           TXT_NewLabel("Connect to address: "),
+                           address_box = TXT_NewInputBox(&connect_address, 30),
+                           NULL),
+                   TXT_NewButton("Find server on Internet..."),
+                   TXT_NewButton("Find server on local network..."),
                    NULL);
 
     TXT_SignalConnect(address_box, "changed", SelectAddressJoin, NULL);
-- 
cgit v1.2.3