stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 04:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set GS_LEVEL after level load, set GS_WAITINGFORPLAYERS during level transition if GS_LEVEL is current GS

Browse source
This commit is contained in:
JugadorXEI 2021-05-28 16:32:21 +02:00
parent dfc942a628
commit 733cf20a10
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.c
View file

@ -1597,9 +1597,9 @@ void D_SRB2Main(void)
{
pagename = "TITLESKY";
levelstarttic = gametic;
G_SetGamestate(GS_LEVEL);
if (!P_SetupLevel(false))
I_Quit(); // fail so reset game stuff
G_SetGamestate(GS_LEVEL);
}
#ifdef HAVE_DISCORDRPC

22
src/g_game.c
View file

@ -1733,14 +1733,12 @@ void G_DoLoadLevel(boolean resetplayer)
Y_EndIntermission();
if (gamestate == GS_VOTING)
Y_EndVote();
G_SetGamestate(GS_LEVEL);
for (i = 0; i < MAXPLAYERS; i++)
{
if (resetplayer || (playeringame[i] && players[i].playerstate == PST_DEAD))
players[i].playerstate = PST_REBORN;
}
// Don't allow people to download a partial/corrupted
// save while the server's loading the map/during the wipe.
// (this addresses "map" command usage, which means
// transitions/different gamestates would be skipped.)
if (gamestate == GS_LEVEL)
gamestate = GS_WAITINGPLAYERS;
// Setup the level.
if (!P_SetupLevel(false))
@ -1750,6 +1748,14 @@ void G_DoLoadLevel(boolean resetplayer)
return;
}
G_SetGamestate(GS_LEVEL);
for (i = 0; i < MAXPLAYERS; i++)
{
if (resetplayer || (playeringame[i] && players[i].playerstate == PST_DEAD))
players[i].playerstate = PST_REBORN;
}
if (!resetplayer)
P_FindEmerald();