stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-07 08:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Delay falling, longer exit timer

Browse source
This commit is contained in:
TehRealSalt 2018-09-13 19:13:43 -04:00
parent 250c61dd00
commit ce85c2b7bd
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 = (14*TICRATE)/5 + 1; players[i].exiting = (21*TICRATE)/5 + 1;
} }
S_StartSound(NULL, sfx_lvpass); S_StartSound(NULL, sfx_lvpass);
} }

2
src/p_mobj.c
View file

@ -1410,7 +1410,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
gravityadd = FixedMul(gravityadd, 5*FRACUNIT); // Double gravity gravityadd = FixedMul(gravityadd, 5*FRACUNIT); // Double gravity
break; break;
case MT_SIGN: case MT_SIGN:
gravityadd /= 3; gravityadd /= 4;
break; break;
default: default:
break; break;

6
src/p_spec.c
View file

@ -3229,7 +3229,7 @@ void P_SetupSignExit(player_t *player)
// SRB2Kart: Set sign spinning variables // SRB2Kart: Set sign spinning variables
thing->movefactor = thing->z; thing->movefactor = thing->z;
thing->z += (512<<FRACBITS) * P_MobjFlip(thing); thing->z += (640<<FRACBITS) * P_MobjFlip(thing);
thing->movecount = 1; thing->movecount = 1;
++numfound; ++numfound;
@ -3259,7 +3259,7 @@ void P_SetupSignExit(player_t *player)
// SRB2Kart: Set sign spinning variables // SRB2Kart: Set sign spinning variables
thing->movefactor = thing->z; thing->movefactor = thing->z;
thing->z += (512<<FRACBITS) * P_MobjFlip(thing); thing->z += (640<<FRACBITS) * P_MobjFlip(thing);
thing->movecount = 1; thing->movecount = 1;
++numfound; ++numfound;
@ -3271,7 +3271,7 @@ void P_SetupSignExit(player_t *player)
// SRB2Kart: FINALLY, add in an alternative if no place is found // SRB2Kart: FINALLY, add in an alternative if no place is found
if (player->mo) if (player->mo)
{ {
mobj_t *sign = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + (512<<FRACBITS), MT_SIGN); mobj_t *sign = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + (640<<FRACBITS), MT_SIGN);
P_SetTarget(&sign->target, player->mo); P_SetTarget(&sign->target, player->mo);
P_SetMobjState(sign, S_SIGN1); P_SetMobjState(sign, S_SIGN1);

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 = (14*TICRATE)/5 + 1; players[i].exiting = (21*TICRATE)/5 + 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 = (14*TICRATE)/5 + 1; players[i].exiting = (21*TICRATE)/5 + 1;
} }
sstimer = 0; sstimer = 0;

16
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 = 3*TICRATE; player->exiting = 6*TICRATE;
stagefailed = true; // NIGHT OVER stagefailed = true; // NIGHT OVER
} }
@ -1741,7 +1741,7 @@ void P_DoPlayerExit(player_t *player)
S_StartSound(player->mo, sfx_kwin); S_StartSound(player->mo, sfx_kwin);
} }
player->exiting = 3*TICRATE; player->exiting = 6*TICRATE;
if (cv_inttime.value > 0) if (cv_inttime.value > 0)
P_EndingMusic(player); P_EndingMusic(player);
@ -1751,7 +1751,7 @@ void P_DoPlayerExit(player_t *player)
//countdown2 = countdown + 8*TICRATE; //countdown2 = countdown + 8*TICRATE;
if (P_CheckRacers()) if (P_CheckRacers())
player->exiting = (14*TICRATE)/5 + 1; player->exiting = (21*TICRATE)/5 + 1;
} }
else if (G_BattleGametype()) // Battle Mode exiting else if (G_BattleGametype()) // Battle Mode exiting
{ {
@ -1759,7 +1759,7 @@ void P_DoPlayerExit(player_t *player)
P_EndingMusic(player); P_EndingMusic(player);
} }
else else
player->exiting = (14*TICRATE)/5 + 2; // Accidental death safeguard??? player->exiting = (21*TICRATE)/5 + 2; // Accidental death safeguard???
//player->pflags &= ~PF_GLIDING; //player->pflags &= ~PF_GLIDING;
/* // SRB2kart - don't need /* // SRB2kart - don't need
@ -6569,7 +6569,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 = (14*TICRATE)/5 + 1; players[i].exiting = (21*TICRATE)/5 + 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);
@ -9037,8 +9037,8 @@ void P_PlayerThink(player_t *player)
} }
} }
if (i == MAXPLAYERS && player->exiting == 3*TICRATE) // finished if (i == MAXPLAYERS && player->exiting == 6*TICRATE) // finished
player->exiting = (14*TICRATE)/5 + 1; player->exiting = (21*TICRATE)/5 + 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!
@ -9063,7 +9063,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 < 3*TICRATE || !G_RaceGametype())) // SRB2kart - "&& player->exiting > 1" if (player->exiting > 1 && (player->exiting < 6*TICRATE || !G_RaceGametype())) // SRB2kart - "&& player->exiting > 1"
player->exiting--; player->exiting--;
if (player->exiting && countdown2) if (player->exiting && countdown2)