From 930835f1a2bd189f9bd73c5eba3459282720f0e5 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sun, 25 Nov 2018 21:47:56 -0500
Subject: [PATCH] Dummy out OpenGL loading screen; fix console toggle so it
doesn't actually show
---
src/d_netcmd.c | 5 ++++-
src/hardware/hw_bsp.c | 2 ++
src/hardware/hw_glob.h | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index e5ef3e1ce..16788baeb 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1796,6 +1796,10 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
mapname, resetplayer, lastgametype, gametype, chmappending));
CONS_Printf(M_GetText("Speeding off to level...\n"));
}
+
+ CON_ToggleOff();
+ CON_ClearHUD();
+
if (demoplayback && !timingdemo)
precache = false;
@@ -1812,7 +1816,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene);
if (demoplayback && !timingdemo)
precache = true;
- CON_ToggleOff();
if (timingdemo)
G_DoneLevelLoad();
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index fa5bce308..a180697d5 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -633,6 +633,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
HWR_SubsecPoly(bspnum&(~NF_SUBSECTOR), poly);
//Hurdler: implement a loading status
+#ifdef HWR_LOADING_SCREEN
if (ls_count-- <= 0)
{
char s[16];
@@ -657,6 +658,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
I_UpdateNoVsync();
}
+#endif
}
M_ClearBox(bbox);
poly = extrasubsectors[bspnum&~NF_SUBSECTOR].planepoly;
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index fea06caff..bdf219464 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -27,6 +27,9 @@
// the original aspect ratio of Doom graphics isn't square
#define ORIGINAL_ASPECT (320.0f/200.0f)
+// Uncomment this to enable the OpenGL loading screen
+//#define HWR_LOADING_SCREEN
+
// -----------
// structures
// -----------
--
GitLab