thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reset properties on map load

Browse source
This commit is contained in:
Sally Coolatta 2021-02-12 20:25:03 -05:00
parent 10319386c2
commit e2dcc35bcd
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/g_game.c
View file

@ -246,11 +246,11 @@ INT32 gameovertics = 15*TICRATE;
UINT8 ammoremovaltics = 2*TICRATE; UINT8 ammoremovaltics = 2*TICRATE;
// SRB2kart // SRB2kart
tic_t introtime = 0; tic_t introtime = 3;
tic_t starttime = 0; tic_t starttime = 3;
const tic_t bulbtime = TICRATE/2; const tic_t bulbtime = TICRATE/2;
UINT8 numbulbs = 0; UINT8 numbulbs = 1;
tic_t raceexittime = 5*TICRATE + (2*TICRATE/3); tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
tic_t battleexittime = 8*TICRATE; tic_t battleexittime = 8*TICRATE;

6
src/k_kart.c
View file

@ -43,6 +43,12 @@
// indirectitemcooldown is timer before anyone's allowed another Shrink/SPB // indirectitemcooldown is timer before anyone's allowed another Shrink/SPB
// mapreset is set when enough players fill an empty server // mapreset is set when enough players fill an empty server
void K_TimerReset(void)
{
starttime = introtime = 3;
numbulbs = 1;
}
void K_TimerInit(void) void K_TimerInit(void)
{ {
UINT8 i; UINT8 i;

1
src/k_kart.h
View file

@ -17,6 +17,7 @@ angle_t K_ReflectAngle(angle_t angle, angle_t against, fixed_t maxspeed, fixed_t
void K_RegisterKartStuff(void); void K_RegisterKartStuff(void);
void K_TimerReset(void);
void K_TimerInit(void); void K_TimerInit(void);
UINT16 K_GetPlayerDontDrawFlag(player_t *player); UINT16 K_GetPlayerDontDrawFlag(player_t *player);
boolean K_IsPlayerLosing(player_t *player); boolean K_IsPlayerLosing(player_t *player);

2
src/p_setup.c
View file

@ -4157,6 +4157,8 @@ boolean P_LoadLevel(boolean fromnetsave)
LUAh_MapLoad(); LUAh_MapLoad();
} }
K_TimerReset();
// No render mode, stop here. // No render mode, stop here.
if (rendermode == render_none) if (rendermode == render_none)
return true; return true;