From af6d64468da3cf2d7af66793f70dd765dded4dd1 Mon Sep 17 00:00:00 2001 From: Yukita Mayako <catgirl@goddess.moe> Date: Tue, 23 Feb 2016 22:06:24 -0500 Subject: [PATCH] Fix charsel music for host. --- src/d_clisrv.c | 6 +----- src/d_enet.c | 2 -- src/d_netcmd.c | 6 ++++++ src/m_menu.c | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 696e5d0dc5..ed183b1c3b 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -481,11 +481,7 @@ static boolean CL_SendJoin(void) return true; } if (server) // no need to ask yourself if you can join! - { - cl_mode = cl_connected; - M_StartControlPanel(); - M_SetupNetgameChoosePlayer(); - } + return true; else Net_SendJoin(); return true; diff --git a/src/d_enet.c b/src/d_enet.c index a54af38589..4b3b5ad57e 100644 --- a/src/d_enet.c +++ b/src/d_enet.c @@ -95,8 +95,6 @@ static void ClientHandlePacket(UINT8 node, DataWrap data) INT16 mapnum = data->ReadINT16(data); gametype = data->ReadINT16(data); G_InitNew(false, G_BuildMapName(mapnum), true, true); - M_StartControlPanel(); - M_SetupNetgameChoosePlayer(); break; } default: diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3d2c60f7ea..1e37799593 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1774,6 +1774,12 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum) if (demorecording) // Okay, level loaded, character spawned and skinned, G_BeginRecording(); // I AM NOW READY TO RECORD. demo_start = true; + + if (netgame && !addedtogame) + { + M_StartControlPanel(); + M_SetupNetgameChoosePlayer(); + } } static void Command_Pause(void) diff --git a/src/m_menu.c b/src/m_menu.c index 904a8c8dc6..f9f97b1dd7 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -5032,7 +5032,6 @@ void M_SetupNetgameChoosePlayer(void) return; } - S_StopMusic(); S_ChangeMusic(mus_chrsel, true); M_SetupNextMenu(&MP_PlayerDef); -- GitLab