Merge branch 'fix-twodee-dedicated' into 'master'

Fix dedicated server crashes + disable GP

See merge request KartKrew/Kart!1009
This commit is contained in:
Sal 2023-03-04 02:59:03 +00:00
commit 0fa1e99a82
2 changed files with 14 additions and 6 deletions

View file

@ -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.
@ -1653,7 +1659,7 @@ void D_SRB2Main(void)
}
{
if (!M_CheckParm("-server"))
if (!M_CheckParm("-server") && !M_CheckParm("-dedicated"))
{
G_SetUsedCheats();

View file

@ -237,7 +237,9 @@ void ST_Start(void)
ST_Stop();
ST_InitData();
st_stopped = false;
if (!dedicated)
st_stopped = false;
}
//