incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

time to be semantically correct

Browse source
This commit is contained in:
minenice55 2026-01-28 15:26:29 -05:00
parent 7ae5065b61
commit 52aa5543b1
4 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -104,7 +104,7 @@ typedef enum
PF_JUSTFLIPPED = 1<<27, // Just got flipped over, handle the bump interaction.
PF_CHARGINGSSMT = 1<<28, // Player was charging SSMT last tick
PF_RECOVERYSPIN = 1<<28, // Player was charging SSMT last tick
PF_USEDOWN = 1<<29, // For lua compat, don't use!
PF_ATTACKDOWN = 1<<30, // For lua compat, don't use!

2
src/g_game.c
View file

@ -1547,7 +1547,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
if (value != 0)
{
cmd->buttons |= BT_BRAKE;
if (!(player->pflags & PF_CHARGINGSSMT))
if (!(player->pflags & PF_RECOVERYSPIN))
{
forward -= (value * 25) / JOYAXISRANGE;
}

42
src/k_kart.c
View file

@ -2183,7 +2183,7 @@ boolean K_ApplyOffroad(const player_t *player)
if (player->hyudorotimer || sneakertimer ||
(cv_kartbubble_boost_offroadignore.value && player->bubbleboost) ||
player->recoverydash || (player->pflags & PF_CHARGINGSSMT))
player->recoverydash || (player->pflags & PF_RECOVERYSPIN))
return false;
return true;
}
@ -2853,7 +2853,7 @@ static void K_GetKartBoostPower(player_t *player)
K_DoBoost(player, SSMTSPEEDBOOST, SSMTACCELBOOST, SSMTHANDLEBOOST, false, true); // + 10% top speed, + ?% acceleration
}
if ((player->pflags & PF_CHARGINGSSMT))
if ((player->pflags & PF_RECOVERYSPIN))
{
if (player->flashing || player->recoverydashcharge >= TICRATE)
{
@ -9309,7 +9309,7 @@ static void K_KartDrift(player_t *player, boolean onground)
minspeed = FixedMul(10<<FRACBITS, mapobjectscale);
// horrible
if (player->pflags & PF_CHARGINGSSMT)
if (player->pflags & PF_RECOVERYSPIN)
minspeed = (player->speed+1);
// air thrust drag
@ -9508,7 +9508,7 @@ static void K_KartDrift(player_t *player, boolean onground)
// Stop drifting
// experiment: wall transfers should allow zero speed
// reasoning: when driving right into a half pipe face-on, there is no h-speed for the entire launch
if ((player->walltransfered || player->dashRingPullTics || player->dashRingPushTics) && !(player->pflags & PF_CHARGINGSSMT))
if ((player->walltransfered || player->dashRingPullTics || player->dashRingPushTics) && !(player->pflags & PF_RECOVERYSPIN))
{
minspeed = 0;
}
@ -9655,33 +9655,33 @@ static void K_KartSlipdash(player_t *player, boolean onground)
}
}
static boolean K_PlayerCanStartSsmt(player_t *player)
static boolean K_PlayerCanStartRecoverySpin(player_t *player)
{
return (K_RecoveryDashActive() && P_IsObjectOnGround(player->mo) &&
player->speed <= 12*player->mo->scale && (!(player->pflags & PF_CHARGINGSSMT)) &&
(player->cmd.buttons & BT_ACCELERATE) && (player->cmd.buttons & BT_BRAKE));
return (K_RecoveryDashActive() && P_IsObjectOnGround(player->mo) && (!(player->pflags & PF_STASIS)) && (player->carry == CR_NONE) &&
player->speed <= 12*player->mo->scale && (!(player->pflags & PF_RECOVERYSPIN)) &&
(player->cmd.buttons & BT_ACCELERATE) && (player->cmd.buttons & BT_BRAKE) && !(player->cmd.buttons & BT_DRIFT));
}
static boolean K_PlayerCanChargeSsmt(player_t *player)
static boolean K_PlayerCanRecoverySpin(player_t *player)
{
return (K_RecoveryDashActive() && leveltime > starttime &&
return (K_RecoveryDashActive() && leveltime > starttime && (!(player->pflags & PF_STASIS)) && (player->carry == CR_NONE) &&
!(player->sneakertimer || K_IsPlayerDamaged(player) || player->squishedtimer || player->exiting));
}
static void K_StandStillMiniTurbo(player_t *player)
static void K_RecoveryDash(player_t *player)
{
if (K_PlayerCanChargeSsmt(player))
if (K_PlayerCanRecoverySpin(player))
{
if (K_PlayerCanStartSsmt(player))
if (K_PlayerCanStartRecoverySpin(player))
{
player->pflags |= PF_CHARGINGSSMT;
player->pflags |= PF_RECOVERYSPIN;
S_StartSound(player->mo, sfx_cdfm20);
}
if (player->pflags & PF_CHARGINGSSMT)
if (player->pflags & PF_RECOVERYSPIN)
{
if ((player->cmd.buttons & BT_ACCELERATE) && (player->cmd.buttons & BT_BRAKE))
{
player->forcedtopspeed = cv_kartrecoverydash_spinspeed.value;
player->forcedtopspeed = cv_kartrecoverydash_spinspeed.value + 1;
if (P_IsObjectOnGround(player->mo))
{
player->recoverydashcharge += 1;
@ -9736,7 +9736,7 @@ static void K_StandStillMiniTurbo(player_t *player)
}
else
{
player->pflags &= ~PF_CHARGINGSSMT;
player->pflags &= ~PF_RECOVERYSPIN;
player->forcedtopspeed = 0;
player->tiregrease = 2*TICRATE;
if (player->recoverydashcharge >= 2*TICRATE && (player->cmd.buttons & BT_ACCELERATE))
@ -9753,7 +9753,7 @@ static void K_StandStillMiniTurbo(player_t *player)
}
else
{
player->pflags &= ~PF_CHARGINGSSMT;
player->pflags &= ~PF_RECOVERYSPIN;
player->forcedtopspeed = 0;
player->recoverydashcharge = 0;
}
@ -10765,7 +10765,7 @@ static void K_AdjustPlayerFriction(player_t *player)
player->mo->friction = prevfriction;
if (player->pflags & PF_CHARGINGSSMT)
if (player->pflags & PF_RECOVERYSPIN)
{
player->mo->friction += 1500;
K_RecalculateMovefactor(player->mo);
@ -11212,12 +11212,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
K_KartSlipdash(player, onground);
K_StandStillMiniTurbo(player);
K_RecoveryDash(player);
// Quick Turning
// You can't turn your kart when you're not moving.
// So now it's time to burn some rubber!
if (player->speed < 2 && leveltime > starttime && (player->cmd.buttons & BT_ACCELERATE) && (player->cmd.buttons & BT_BRAKE) && player->cmd.turning != 0)
if (player->speed < 2 && leveltime > starttime && player->cmd.buttons & BT_ACCELERATE && player->cmd.buttons & BT_BRAKE && player->cmd.turning != 0)
{
if (leveltime % 8 == 0)
S_StartSound(player->mo, sfx_s224);

6
src/p_user.c
View file

@ -2296,13 +2296,13 @@ void P_MovePlayer(player_t *player)
// Drifting sound
// Start looping the sound now.
if (leveltime % 50 == 0 && onground && (player->drift != 0 || (player->pflags & PF_CHARGINGSSMT)))
if (leveltime % 50 == 0 && onground && (player->drift != 0 || (player->pflags & PF_RECOVERYSPIN)))
S_StartSound(player->mo, sfx_drift);
// Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
else if (!S_SoundPlaying(player->mo, sfx_drift) && onground && (player->drift != 0 || (player->pflags & PF_CHARGINGSSMT)))
else if (!S_SoundPlaying(player->mo, sfx_drift) && onground && (player->drift != 0 || (player->pflags & PF_RECOVERYSPIN)))
S_StartSound(player->mo, sfx_drift);
// Ok, we'll stop now.
else if ((player->drift == 0 && !(player->pflags & PF_CHARGINGSSMT)) || (!onground))
else if ((player->drift == 0 && !(player->pflags & PF_RECOVERYSPIN)) || (!onground))
S_StopSoundByID(player->mo, sfx_drift);
K_MoveKartPlayer(player, onground);