stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update name change delay timer even when fading out to load a level

Browse source
This commit is contained in:
Lactozilla 2023-12-27 15:31:50 -03:00
parent e8bd639d9b
commit d057b79552
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/d_main.c
View file

@ -708,14 +708,6 @@ void D_SRB2Loop(void)
I_UpdateTime(cv_timescale.value); I_UpdateTime(cv_timescale.value);
#if 0
if (lastwipetic)
{
oldentertics = lastwipetic;
lastwipetic = 0;
}
#endif
// get real tics // get real tics
entertic = I_GetTime(); entertic = I_GetTime();
realtics = entertic - oldentertics; realtics = entertic - oldentertics;

13
src/g_game.c
View file

@ -80,6 +80,7 @@ static void G_DoWorldDone(void);
static void G_CheckPlayerReborn(void); static void G_CheckPlayerReborn(void);
static void G_TickerEnd(void); static void G_TickerEnd(void);
static void G_UpdateNameChangeRate(void);
char mapmusname[7]; // Music name char mapmusname[7]; // Music name
UINT16 mapmusflags; // Track and reset bit UINT16 mapmusflags; // Track and reset bit
@ -2615,13 +2616,17 @@ void G_Ticker(boolean run)
G_CheckPlayerReborn(); G_CheckPlayerReborn();
G_TickerEnd(); G_TickerEnd();
G_UpdateNameChangeRate();
} }
return; return;
} }
// Oh my God I hope this doesn't implode anything
if (levelstarting || G_GetExitGameFlag()) if (levelstarting || G_GetExitGameFlag())
{
if (run)
G_UpdateNameChangeRate();
return; return;
}
// Run Marathon Mode in-game timer // Run Marathon Mode in-game timer
G_MarathonTicker(); G_MarathonTicker();
@ -2774,7 +2779,10 @@ void G_Ticker(boolean run)
} }
if (run) if (run)
{
G_TickerEnd(); G_TickerEnd();
G_UpdateNameChangeRate();
}
} }
static void G_TickerEnd(void) static void G_TickerEnd(void)
@ -2792,7 +2800,10 @@ static void G_TickerEnd(void)
if (camtoggledelay2) if (camtoggledelay2)
camtoggledelay2--; camtoggledelay2--;
}
static void G_UpdateNameChangeRate(void)
{
if (gametic % NAMECHANGERATE == 0) if (gametic % NAMECHANGERATE == 0)
{ {
memset(player_name_changes, 0, sizeof player_name_changes); memset(player_name_changes, 0, sizeof player_name_changes);