Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
This commit is contained in:
parent
1c3fe3ce83
commit
f0d536b7ee
|
@ -2211,8 +2211,10 @@ static void CL_ConnectToServer(boolean viams)
|
||||||
}
|
}
|
||||||
while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
|
while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
|
||||||
|
|
||||||
|
#ifndef NONET
|
||||||
if (netgame)
|
if (netgame)
|
||||||
F_StartWaitingPlayers();
|
F_StartWaitingPlayers();
|
||||||
|
#endif
|
||||||
DEBFILE(va("Synchronisation Finished\n"));
|
DEBFILE(va("Synchronisation Finished\n"));
|
||||||
|
|
||||||
displayplayer = consoleplayer;
|
displayplayer = consoleplayer;
|
||||||
|
|
17
src/m_menu.c
17
src/m_menu.c
|
@ -1830,7 +1830,6 @@ static menu_t SP_NightsGhostDef =
|
||||||
NULL
|
NULL
|
||||||
};*/
|
};*/
|
||||||
|
|
||||||
#ifndef NONET
|
|
||||||
// Multiplayer
|
// Multiplayer
|
||||||
menu_t MP_MainDef =
|
menu_t MP_MainDef =
|
||||||
{
|
{
|
||||||
|
@ -1841,12 +1840,18 @@ menu_t MP_MainDef =
|
||||||
M_DrawMPMainMenu,
|
M_DrawMPMainMenu,
|
||||||
42, 30,
|
42, 30,
|
||||||
0,
|
0,
|
||||||
M_CancelConnect
|
|
||||||
};
|
|
||||||
menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
|
|
||||||
#endif
|
|
||||||
menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
|
|
||||||
#ifndef NONET
|
#ifndef NONET
|
||||||
|
M_CancelConnect
|
||||||
|
#else
|
||||||
|
NULL
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
|
||||||
|
|
||||||
|
#ifndef NONET
|
||||||
|
menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
|
||||||
|
|
||||||
menu_t MP_ConnectDef =
|
menu_t MP_ConnectDef =
|
||||||
{
|
{
|
||||||
"M_MULTI",
|
"M_MULTI",
|
||||||
|
|
Loading…
Reference in a new issue