diff options
Diffstat (limited to 'src/net_gui.c')
| -rw-r--r-- | src/net_gui.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/net_gui.c b/src/net_gui.c index 600b6ee8..f2c4f1e5 100644 --- a/src/net_gui.c +++ b/src/net_gui.c @@ -24,11 +24,12 @@ // start the game. // +#include <stdio.h> #include <stdlib.h> #include <ctype.h> #include "config.h" -#include "doomstat.h" +#include "doomkeys.h" #include "i_system.h" #include "i_timer.h" @@ -52,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) @@ -100,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]; @@ -143,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 { @@ -258,7 +261,7 @@ static void CheckMD5Sums(void) had_warning = true; } -void NET_WaitForStart(void) +void NET_WaitForStart(net_gamesettings_t *settings) { if (!TXT_Init()) { @@ -266,14 +269,14 @@ void NET_WaitForStart(void) exit(-1); } - I_SetWindowCaption(); - I_SetWindowIcon(); + I_SetWindowTitle("Waiting for game start"); + //I_SetWindowIcon(); BuildGUI(); while (net_waiting_for_start) { - UpdateGUI(); + UpdateGUI(settings); CheckMD5Sums(); TXT_DispatchEvents(); |