stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-10 23:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'opengl-noloading' into 'master'

Browse source 
Hide OpenGL loading screen

See merge request STJr/SRB2!349
This commit is contained in:
Monster Iestyn 2018-11-26 15:30:45 -05:00
commit 4b0d45afd8
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_netcmd.c
View file

@ -1796,6 +1796,10 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
mapname, resetplayer, lastgametype, gametype, chmappending)); mapname, resetplayer, lastgametype, gametype, chmappending));
CONS_Printf(M_GetText("Speeding off to level...\n")); CONS_Printf(M_GetText("Speeding off to level...\n"));
} }
CON_ToggleOff();
CON_ClearHUD();
if (demoplayback && !timingdemo) if (demoplayback && !timingdemo)
precache = false; precache = false;
@ -1812,7 +1816,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene); G_InitNew(ultimatemode, mapname, resetplayer, skipprecutscene);
if (demoplayback && !timingdemo) if (demoplayback && !timingdemo)
precache = true; precache = true;
CON_ToggleOff();
if (timingdemo) if (timingdemo)
G_DoneLevelLoad(); G_DoneLevelLoad();

2
src/hardware/hw_bsp.c
View file

@ -633,6 +633,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
HWR_SubsecPoly(bspnum&(~NF_SUBSECTOR), poly); HWR_SubsecPoly(bspnum&(~NF_SUBSECTOR), poly);
//Hurdler: implement a loading status //Hurdler: implement a loading status
#ifdef HWR_LOADING_SCREEN
if (ls_count-- <= 0) if (ls_count-- <= 0)
{ {
char s[16]; char s[16];
@ -657,6 +658,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
I_UpdateNoVsync(); I_UpdateNoVsync();
} }
#endif
} }
M_ClearBox(bbox); M_ClearBox(bbox);
poly = extrasubsectors[bspnum&~NF_SUBSECTOR].planepoly; poly = extrasubsectors[bspnum&~NF_SUBSECTOR].planepoly;

3
src/hardware/hw_glob.h
View file

@ -27,6 +27,9 @@
// the original aspect ratio of Doom graphics isn't square // the original aspect ratio of Doom graphics isn't square
#define ORIGINAL_ASPECT (320.0f/200.0f) #define ORIGINAL_ASPECT (320.0f/200.0f)
// Uncomment this to enable the OpenGL loading screen
//#define HWR_LOADING_SCREEN
// ----------- // -----------
// structures // structures
// ----------- // -----------