From 546f8d88c30f3cc44c49dc8e9258b5c074a311fc Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Mar 2023 02:50:01 -0800 Subject: [PATCH 1/3] Do not reset twodee context if dedicated server --- src/d_main.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index a543ea333..c649d6997 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -803,8 +803,11 @@ void D_SRB2Loop(void) HW3S_BeginFrameUpdate(); #endif - I_NewTwodeeFrame(); - I_NewImguiFrame(); + if (rendermode != render_none) + { + I_NewTwodeeFrame(); + I_NewImguiFrame(); + } if (realtics > 0 || singletics) { @@ -1497,8 +1500,11 @@ void D_SRB2Main(void) CONS_Printf("I_StartupGraphics()...\n"); I_StartupGraphics(); - I_NewTwodeeFrame(); - I_NewImguiFrame(); + if (rendermode != render_none) + { + I_NewTwodeeFrame(); + I_NewImguiFrame(); + } #ifdef HWRENDER // Lactozilla: Add every hardware mode CVAR and CCMD. From 5efce736807379120fb2d0eb041354f56bea67e9 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Mar 2023 02:59:31 -0800 Subject: [PATCH 2/3] Do not run ST_Ticker if dedicated --- src/st_stuff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 289a6c3a7..24aa174ee 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -237,7 +237,9 @@ void ST_Start(void) ST_Stop(); ST_InitData(); - st_stopped = false; + + if (!dedicated) + st_stopped = false; } // From 17bf7d09357ddb9b370fa9d40d3a2834b4190ec4 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 3 Mar 2023 03:00:03 -0800 Subject: [PATCH 3/3] Do not start dedicated server in GP if -warp is used --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index c649d6997..50a06ac5f 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1655,7 +1655,7 @@ void D_SRB2Main(void) } { - if (!M_CheckParm("-server")) + if (!M_CheckParm("-server") && !M_CheckParm("-dedicated")) { G_SetUsedCheats();