raceexittime var
This commit is contained in:
1 parent
7256e99b12
commit
487e114fee
5 files changed
+16
-12
No files matched your search
@@ -413,6 +413,8 @@ extern UINT16 extralifetics;
|
||||
// SRB2kart
|
||||
extern tic_t introtime;
|
||||
extern tic_t starttime;
|
||||
extern tic_t raceexittime;
|
||||
extern tic_t battleexittime;
|
||||
extern INT32 hyudorotime;
|
||||
extern INT32 stealtime;
|
||||
extern INT32 sneakertime;
|
||||
|
||||
@@ -209,6 +209,8 @@ UINT16 extralifetics = 4*TICRATE;
|
||||
// SRB2kart
|
||||
tic_t introtime = 108+5; // plus 5 for white fade
|
||||
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 stealtime = TICRATE/2;
|
||||
INT32 sneakertime = TICRATE + (TICRATE/3);
|
||||
|
||||
+1
-1
@@ -694,7 +694,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
||||
if (!playeringame[i] || players[i].spectator)
|
||||
continue;
|
||||
|
||||
players[i].exiting = (28*TICRATE)/5 + 1;
|
||||
players[i].exiting = raceexittime+1;
|
||||
}
|
||||
S_StartSound(NULL, sfx_lvpass);
|
||||
}
|
||||
|
||||
+2
-2
@@ -448,7 +448,7 @@ static inline void P_DoSpecialStageStuff(void)
|
||||
{
|
||||
if (playeringame[i])
|
||||
{
|
||||
players[i].exiting = (28*TICRATE)/5 + 1;
|
||||
players[i].exiting = raceexittime+1;
|
||||
players[i].pflags &= ~PF_GLIDING;
|
||||
}
|
||||
|
||||
@@ -485,7 +485,7 @@ static inline void P_DoSpecialStageStuff(void)
|
||||
if (playeringame[i])
|
||||
{
|
||||
players[i].mo->momx = players[i].mo->momy = 0;
|
||||
players[i].exiting = (28*TICRATE)/5 + 1;
|
||||
players[i].exiting = raceexittime+1;
|
||||
}
|
||||
|
||||
sstimer = 0;
|
||||
|
||||
+9
-9
@@ -673,7 +673,7 @@ static void P_DeNightserizePlayer(player_t *player)
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
|
||||
players[i].nightstime = 1; // force everyone else to fall too.
|
||||
player->exiting = 6*TICRATE;
|
||||
player->exiting = raceexittime+2;
|
||||
stagefailed = true; // NIGHT OVER
|
||||
}
|
||||
|
||||
@@ -1744,7 +1744,7 @@ void P_DoPlayerExit(player_t *player)
|
||||
S_StartSound(player->mo, sfx_kwin);
|
||||
}
|
||||
|
||||
player->exiting = 6*TICRATE;
|
||||
player->exiting = raceexittime+2;
|
||||
|
||||
if (cv_inttime.value > 0)
|
||||
P_EndingMusic(player);
|
||||
@@ -1754,15 +1754,15 @@ void P_DoPlayerExit(player_t *player)
|
||||
//countdown2 = countdown + 8*TICRATE;
|
||||
|
||||
if (P_CheckRacers())
|
||||
player->exiting = (28*TICRATE)/5 + 1;
|
||||
player->exiting = raceexittime+1;
|
||||
}
|
||||
else if (G_BattleGametype()) // Battle Mode exiting
|
||||
{
|
||||
player->exiting = 8*TICRATE + 1;
|
||||
player->exiting = battleexittime+1;
|
||||
P_EndingMusic(player);
|
||||
}
|
||||
else
|
||||
player->exiting = (28*TICRATE)/5 + 2; // Accidental death safeguard???
|
||||
player->exiting = raceexittime+2; // Accidental death safeguard???
|
||||
|
||||
//player->pflags &= ~PF_GLIDING;
|
||||
/* // SRB2kart - don't need
|
||||
@@ -6572,7 +6572,7 @@ static void P_MovePlayer(player_t *player)
|
||||
S_StartSound(NULL, sfx_s3k6a);
|
||||
for (i = 0; i < MAXPLAYERS; i++)
|
||||
if (playeringame[i])
|
||||
players[i].exiting = (28*TICRATE)/5 + 1;
|
||||
players[i].exiting = raceexittime+1;
|
||||
}
|
||||
else if (player->health > 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
|
||||
player->exiting = (28*TICRATE)/5 + 1;
|
||||
if (i == MAXPLAYERS && player->exiting == raceexittime+2) // finished
|
||||
player->exiting = raceexittime+1;
|
||||
|
||||
// If 10 seconds are left on the timer,
|
||||
// begin the drown music for countdown!
|
||||
@@ -9066,7 +9066,7 @@ void P_PlayerThink(player_t *player)
|
||||
|
||||
// If it is set, start subtracting
|
||||
// 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--;
|
||||
|
||||
if (player->exiting && countdown2)
|
||||
|
||||
Reference in new issue
Block a user