diff --git a/src/deh_tables.c b/src/deh_tables.c index e55e178d1..4128d21f7 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -1810,6 +1810,11 @@ struct int_const_s const INT_CONST[] = { {"BLANKART", 1}, + // recoverydash stuff + {"RECOVERYDASHADD", RECOVERYDASHADD}, + {"RECOVERYDASHCHARGETIME", RECOVERYDASHCHARGETIME}, + {"RECOVERYDASHWIPETIME", RECOVERYDASHWIPETIME}, + // airdroptype_t {"AIRDROP_NONE", AIRDROP_NONE}, {"AIRDROP_LIGHT", AIRDROP_LIGHT}, diff --git a/src/k_kart.c b/src/k_kart.c index 377ab59cd..a1c1dc220 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9956,7 +9956,7 @@ static void K_RecoveryDash(player_t *player) { player->pflags &= ~PF_RECOVERYSPIN; player->forcedtopspeed = 0; - if (player->recoverydashcharge >= 2*TICRATE && (player->cmd.buttons & BT_ACCELERATE)) + if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME && (player->cmd.buttons & BT_ACCELERATE)) { player->outrun = TICRATE/4; player->recoverydash = TICRATE; @@ -9972,11 +9972,11 @@ static void K_RecoveryDash(player_t *player) if (P_IsObjectOnGround(player->mo)) { player->recoverydashcharge += 1; - K_SpawnWipeoutTrail(player->mo, (player->recoverydashcharge < 3*TICRATE/2)); + K_SpawnWipeoutTrail(player->mo, (player->recoverydashcharge < RECOVERYDASHWIPETIME)); if (leveltime % 6 == 0) { - if (player->recoverydashcharge < 2*TICRATE) + if (player->recoverydashcharge < RECOVERYDASHCHARGETIME) { S_StartSound(player->mo, sfx_s225); } @@ -10007,7 +10007,7 @@ static void K_RecoveryDash(player_t *player) P_SetMobjState(skid, S_RECSPIN_SKID); K_MatchGenericExtraFlags(skid, player->mo); - if (player->recoverydashcharge >= 2*TICRATE) + if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME) { skid->renderflags |= RF_TRANS20; } @@ -10020,9 +10020,9 @@ static void K_RecoveryDash(player_t *player) } } - if (player->recoverydashcharge >= 2*TICRATE) + if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME) { - if (player->recoverydashcharge == 2*TICRATE) + if (player->recoverydashcharge == RECOVERYDASHCHARGETIME) S_StartSound(player->mo, sfx_s3ka2); if (leveltime & 1) @@ -10045,7 +10045,7 @@ static void K_RecoveryDash(player_t *player) spark->angle = sparkangle; spark->color = SKINCOLOR_WHITE; - if (player->recoverydashcharge >= 2*TICRATE + TICRATE/4) + if (player->recoverydashcharge >= RECOVERYDASHCHARGETIME + TICRATE/4) { P_SetMobjState(spark, S_DRIFTSPARK_B1); } diff --git a/src/k_kart.h b/src/k_kart.h index 0612c9f52..f3ccc08d0 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -434,6 +434,12 @@ typedef enum boolean K_NullDriftTiltEnalbed(); +#define RECOVERYDASHADD (TICRATE/3) +//og val 2*TICRATE +#define RECOVERYDASHCHARGETIME (TICRATE+RECOVERYDASHADD) +//og val 3*TICRATE/2 +#define RECOVERYDASHWIPETIME ((2*TICRATE/2)+RECOVERYDASHADD) + #ifdef __cplusplus } // extern "C" #endif