thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Different timings

Browse source
This commit is contained in:
TehRealSalt 2018-09-21 19:44:14 -04:00
parent 932572abf8
commit fef5ec005f
5 changed files with 19 additions and 19 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 = (21*TICRATE)/5 + 1; players[i].exiting = (28*TICRATE)/5 + 1;
} }
S_StartSound(NULL, sfx_lvpass); S_StartSound(NULL, sfx_lvpass);
} }

12
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 /= 4; gravityadd /= 8;
break; break;
default: default:
break; break;
@ -8291,8 +8291,8 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->z <= mobj->movefactor) if (mobj->z <= mobj->movefactor)
{ {
P_SetMobjState(mobj, S_SIGN_END); P_SetMobjState(mobj, S_SIGN_END);
if (thing->info->attacksound) if (mobj->info->attacksound)
S_StartSound(thing, thing->info->attacksound); S_StartSound(mobj, mobj->info->attacksound);
mobj->z = mobj->movefactor; mobj->z = mobj->movefactor;
//mobj->flags |= MF_NOGRAVITY; // ? //mobj->flags |= MF_NOGRAVITY; // ?
mobj->flags &= ~MF_NOCLIPHEIGHT; mobj->flags &= ~MF_NOCLIPHEIGHT;
@ -8305,6 +8305,12 @@ void P_MobjThinker(mobj_t *mobj)
mobj->z + (24<<FRACBITS) + (P_RandomRange(-16,16)<<FRACBITS), mobj->z + (24<<FRACBITS) + (P_RandomRange(-16,16)<<FRACBITS),
MT_RINGSPARKLE); MT_RINGSPARKLE);
mobj->flags &= ~MF_NOGRAVITY; mobj->flags &= ~MF_NOGRAVITY;
if (abs(mobj->z - mobj->movefactor) <= 512<<FRACBITS && !mobj->cvmem)
{
if (mobj->info->seesound)
S_StartSound(mobj, mobj->info->seesound);
mobj->cvmem = 1;
}
} }
} }
break; break;

12
src/p_spec.c
View file

@ -3227,12 +3227,10 @@ void P_SetupSignExit(player_t *player)
P_SetTarget(&thing->target, player->mo); P_SetTarget(&thing->target, player->mo);
P_SetMobjState(thing, S_SIGN1); P_SetMobjState(thing, S_SIGN1);
if (thing->info->seesound)
S_StartSound(thing, thing->info->seesound);
// SRB2Kart: Set sign spinning variables // SRB2Kart: Set sign spinning variables
thing->movefactor = thing->z; thing->movefactor = thing->z;
thing->z += (640<<FRACBITS) * P_MobjFlip(thing); thing->z += (768<<FRACBITS) * P_MobjFlip(thing);
thing->movecount = 1; thing->movecount = 1;
++numfound; ++numfound;
@ -3257,12 +3255,10 @@ void P_SetupSignExit(player_t *player)
P_SetTarget(&thing->target, player->mo); P_SetTarget(&thing->target, player->mo);
P_SetMobjState(thing, S_SIGN1); P_SetMobjState(thing, S_SIGN1);
if (thing->info->seesound)
S_StartSound(thing, thing->info->seesound);
// SRB2Kart: Set sign spinning variables // SRB2Kart: Set sign spinning variables
thing->movefactor = thing->z; thing->movefactor = thing->z;
thing->z += (640<<FRACBITS) * P_MobjFlip(thing); thing->z += (768<<FRACBITS) * P_MobjFlip(thing);
thing->movecount = 1; thing->movecount = 1;
++numfound; ++numfound;
@ -3274,12 +3270,10 @@ 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 + (640<<FRACBITS), MT_SIGN); mobj_t *sign = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + (768<<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);
if (sign->info->seesound)
S_StartSound(sign, sign->info->seesound);
sign->movefactor = player->mo->floorz; sign->movefactor = player->mo->floorz;
sign->movecount = 1; sign->movecount = 1;
} }

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

8
src/p_user.c
View file

@ -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 = (21*TICRATE)/5 + 1; player->exiting = (28*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 = (21*TICRATE)/5 + 2; // Accidental death safeguard??? player->exiting = (28*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 = (21*TICRATE)/5 + 1; players[i].exiting = (28*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);
@ -9038,7 +9038,7 @@ void P_PlayerThink(player_t *player)
} }
if (i == MAXPLAYERS && player->exiting == 6*TICRATE) // finished if (i == MAXPLAYERS && player->exiting == 6*TICRATE) // finished
player->exiting = (21*TICRATE)/5 + 1; player->exiting = (28*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!