thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-20 23:12:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'gl-no-resend-load' into 'master'

Browse source 
Don't draw OpenGL loading screen when resynching the gamestate

See merge request KartKrew/Kart!2209
This commit is contained in:
Oni 2024-04-03 01:06:56 +00:00
commit 4d0b02413d
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hardware/hw_bsp.c
View file

@ -584,7 +584,7 @@ static void loading_status(void)
char s[16]; char s[16];
int x, y; int x, y;
if ((gamestate == GS_TITLESCREEN && titlemapinaction) || demo.attract == DEMO_ATTRACT_CREDITS) if ((gamestate == GS_TITLESCREEN && titlemapinaction) || demo.attract == DEMO_ATTRACT_CREDITS || g_reloadinggamestate)
{ {
return; return;
} }

2
src/p_setup.cpp
View file

@ -126,6 +126,7 @@
#include <tracy/tracy/TracyC.h> #include <tracy/tracy/TracyC.h>
extern "C" consvar_t cv_continuousmusic; extern "C" consvar_t cv_continuousmusic;
boolean g_reloadinggamestate = false;
// //
// Map MD5, calculated on level load. // Map MD5, calculated on level load.
@ -8329,6 +8330,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
virtlump_t *encoreLump = NULL; virtlump_t *encoreLump = NULL;
levelloading = true; levelloading = true;
g_reloadinggamestate = reloadinggamestate;
// This is needed. Don't touch. // This is needed. Don't touch.
maptol = mapheaderinfo[gamemap-1]->typeoflevel; maptol = mapheaderinfo[gamemap-1]->typeoflevel;

1
src/p_setup.h
View file

@ -32,6 +32,7 @@ extern mapthing_t *deathmatchstarts[MAX_DM_STARTS];
extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts, numfaultstarts; extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts, numfaultstarts;
extern boolean levelloading; extern boolean levelloading;
extern boolean g_reloadinggamestate;
extern UINT8 levelfadecol; extern UINT8 levelfadecol;
extern tic_t oldbest; extern tic_t oldbest;