From aea87ebe87a548eb2403a8ea2b3a401246894a6f Mon Sep 17 00:00:00 2001 From: Roman Fomin Date: Thu, 11 Aug 2022 10:55:36 +0700 Subject: [PATCH] disable -speed parameter for netgame Though custom speed works in -oldsync mode. --- src/d_main.c | 2 ++ src/m_menu.c | 5 ++--- src/m_menu.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index cdda18597..c431069d8 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -2512,6 +2512,8 @@ void D_DoomMain(void) puts("D_CheckNetGame: Checking network game status."); D_CheckNetGame(); + M_ResetTimeScale(); + puts("S_Init: Setting up sound."); S_Init(snd_SfxVolume /* *8 */, snd_MusicVolume /* *8*/ ); diff --git a/src/m_menu.c b/src/m_menu.c index 228c8bf70..e0b18846d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3847,9 +3847,9 @@ static void M_UpdateStrictModeItems(void) DISABLE_STRICT(gen_settings3[general_screen_melt]); } -static void M_ResetTimeScale(void) +void M_ResetTimeScale(void) { - if (strictmode) + if (strictmode || D_CheckNetConnect()) I_SetTimeScale(100); else { @@ -6831,7 +6831,6 @@ void M_ResetSetupMenu(void) M_UpdateCenteredWeaponItem(); M_UpdateMultiLineMsgItem(); M_UpdateStrictModeItems(); - M_ResetTimeScale(); M_Trans(); } diff --git a/src/m_menu.h b/src/m_menu.h index 6118ee5a9..35bbe0f0c 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -75,6 +75,8 @@ void M_ResetSetupMenu(void); void M_ResetSetupMenuVideo(void); +void M_ResetTimeScale(void); + void M_DrawBackground(char *patch, byte *screen); // killough 11/98 void M_DrawCredits(void); // killough 11/98