diff options
Diffstat (limited to 'src/net_gui.c')
| -rw-r--r-- | src/net_gui.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/net_gui.c b/src/net_gui.c index 8c848d1c..f2c4f1e5 100644 --- a/src/net_gui.c +++ b/src/net_gui.c @@ -53,9 +53,11 @@ static void EscapePressed(TXT_UNCAST_ARG(widget), void *unused) I_Quit(); } -static void StartGame(TXT_UNCAST_ARG(widget), void *unused) +static void StartGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(settings)) { - NET_CL_StartGame(); + TXT_CAST_ARG(net_gamesettings_t, settings); + + NET_CL_StartGame(settings); } static void BuildGUI(void) @@ -101,7 +103,7 @@ static void BuildGUI(void) TXT_SetWindowAction(window, TXT_HORIZ_LEFT, cancel); } -static void UpdateGUI(void) +static void UpdateGUI(net_gamesettings_t *settings) { txt_window_action_t *startgame; char buf[50]; @@ -144,7 +146,7 @@ static void UpdateGUI(void) if (net_client_controller) { startgame = TXT_NewWindowAction(' ', "Start game"); - TXT_SignalConnect(startgame, "pressed", StartGame, NULL); + TXT_SignalConnect(startgame, "pressed", StartGame, settings); } else { @@ -259,7 +261,7 @@ static void CheckMD5Sums(void) had_warning = true; } -void NET_WaitForStart(void) +void NET_WaitForStart(net_gamesettings_t *settings) { if (!TXT_Init()) { @@ -268,13 +270,13 @@ void NET_WaitForStart(void) } I_SetWindowTitle("Waiting for game start"); - I_SetWindowIcon(); + //I_SetWindowIcon(); BuildGUI(); while (net_waiting_for_start) { - UpdateGUI(); + UpdateGUI(settings); CheckMD5Sums(); TXT_DispatchEvents(); @@ -285,7 +287,7 @@ void NET_WaitForStart(void) if (!net_client_connected) { - I_Error("Disconnected from server"); + I_Error("Lost connection to server"); } TXT_Sleep(100); |