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

raceexittime var

Browse source
This commit is contained in:
TehRealSalt 2018-09-22 18:59:26 -04:00
parent 2e0365645e
commit 8bc02a3ec6
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomstat.h
View file

@ -413,6 +413,8 @@ extern UINT16 extralifetics;
// SRB2kart // SRB2kart
extern tic_t introtime; extern tic_t introtime;
extern tic_t starttime; extern tic_t starttime;
extern tic_t raceexittime;
extern tic_t battleexittime;
extern INT32 hyudorotime; extern INT32 hyudorotime;
extern INT32 stealtime; extern INT32 stealtime;
extern INT32 sneakertime; extern INT32 sneakertime;

2
src/g_game.c
View file

@ -209,6 +209,8 @@ UINT16 extralifetics = 4*TICRATE;
// SRB2kart // SRB2kart
tic_t introtime = 108+5; // plus 5 for white fade tic_t introtime = 108+5; // plus 5 for white fade
tic_t starttime = 6*TICRATE + (3*TICRATE/4); tic_t starttime = 6*TICRATE + (3*TICRATE/4);
tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
tic_t battleexittime = 8*TICRATE;
INT32 hyudorotime = 7*TICRATE; INT32 hyudorotime = 7*TICRATE;
INT32 stealtime = TICRATE/2; INT32 stealtime = TICRATE/2;
INT32 sneakertime = TICRATE + (TICRATE/3); INT32 sneakertime = TICRATE + (TICRATE/3);

2
src/p_inter.c
View file

@ -694,7 +694,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (!playeringame[i] || players[i].spectator) if (!playeringame[i] || players[i].spectator)
continue; continue;
players[i].exiting = (28*TICRATE)/5 + 1; players[i].exiting = raceexittime+1;
} }
S_StartSound(NULL, sfx_lvpass); S_StartSound(NULL, sfx_lvpass);
} }

4
src/p_tick.c
View file

@ -448,7 +448,7 @@ static inline void P_DoSpecialStageStuff(void)
{ {
if (playeringame[i]) if (playeringame[i])
{ {
players[i].exiting = (28*TICRATE)/5 + 1; players[i].exiting = raceexittime+1;
players[i].pflags &= ~PF_GLIDING; players[i].pflags &= ~PF_GLIDING;
} }
@ -485,7 +485,7 @@ static inline void P_DoSpecialStageStuff(void)
if (playeringame[i]) if (playeringame[i])
{ {
players[i].mo->momx = players[i].mo->momy = 0; players[i].mo->momx = players[i].mo->momy = 0;
players[i].exiting = (28*TICRATE)/5 + 1; players[i].exiting = raceexittime+1;
} }
sstimer = 0; sstimer = 0;

18
src/p_user.c
View file

@ -673,7 +673,7 @@ static void P_DeNightserizePlayer(player_t *player)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE) if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
players[i].nightstime = 1; // force everyone else to fall too. players[i].nightstime = 1; // force everyone else to fall too.
player->exiting = 6*TICRATE; player->exiting = raceexittime+2;
stagefailed = true; // NIGHT OVER stagefailed = true; // NIGHT OVER
} }
@ -1744,7 +1744,7 @@ void P_DoPlayerExit(player_t *player)
S_StartSound(player->mo, sfx_kwin); S_StartSound(player->mo, sfx_kwin);
} }
player->exiting = 6*TICRATE; player->exiting = raceexittime+2;
if (cv_inttime.value > 0) if (cv_inttime.value > 0)
P_EndingMusic(player); P_EndingMusic(player);
@ -1754,15 +1754,15 @@ void P_DoPlayerExit(player_t *player)
//countdown2 = countdown + 8*TICRATE; //countdown2 = countdown + 8*TICRATE;
if (P_CheckRacers()) if (P_CheckRacers())
player->exiting = (28*TICRATE)/5 + 1; player->exiting = raceexittime+1;
} }
else if (G_BattleGametype()) // Battle Mode exiting else if (G_BattleGametype()) // Battle Mode exiting
{ {
player->exiting = 8*TICRATE + 1; player->exiting = battleexittime+1;
P_EndingMusic(player); P_EndingMusic(player);
} }
else else
player->exiting = (28*TICRATE)/5 + 2; // Accidental death safeguard??? player->exiting = raceexittime+2; // Accidental death safeguard???
//player->pflags &= ~PF_GLIDING; //player->pflags &= ~PF_GLIDING;
/* // SRB2kart - don't need /* // SRB2kart - don't need
@ -6572,7 +6572,7 @@ static void P_MovePlayer(player_t *player)
S_StartSound(NULL, sfx_s3k6a); S_StartSound(NULL, sfx_s3k6a);
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i]) if (playeringame[i])
players[i].exiting = (28*TICRATE)/5 + 1; players[i].exiting = raceexittime+1;
} }
else if (player->health > 1) else if (player->health > 1)
P_DamageMobj(player->mo, NULL, NULL, 1); P_DamageMobj(player->mo, NULL, NULL, 1);
@ -9040,8 +9040,8 @@ void P_PlayerThink(player_t *player)
} }
} }
if (i == MAXPLAYERS && player->exiting == 6*TICRATE) // finished if (i == MAXPLAYERS && player->exiting == raceexittime+2) // finished
player->exiting = (28*TICRATE)/5 + 1; player->exiting = raceexittime+1;
// If 10 seconds are left on the timer, // If 10 seconds are left on the timer,
// begin the drown music for countdown! // begin the drown music for countdown!
@ -9066,7 +9066,7 @@ void P_PlayerThink(player_t *player)
// If it is set, start subtracting // If it is set, start subtracting
// Don't allow it to go back to 0 // Don't allow it to go back to 0
if (player->exiting > 1 && (player->exiting < 6*TICRATE || !G_RaceGametype())) // SRB2kart - "&& player->exiting > 1" if (player->exiting > 1 && (player->exiting < raceexittime+2 || !G_RaceGametype())) // SRB2kart - "&& player->exiting > 1"
player->exiting--; player->exiting--;
if (player->exiting && countdown2) if (player->exiting && countdown2)