From e9b79efe2dae44000dcce51a404a2561a4e3cb53 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sun, 18 May 2025 17:48:41 -0400 Subject: [PATCH] rename calc_arg_offset to match newest booststack --- src/d_netcmd.c | 2 +- src/d_netcmd.h | 2 +- src/k_kart.c | 4 ++-- src/k_kart.h | 3 +-- src/p_mobj.c | 8 ++++---- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index a5e1995a7..e894a20dc 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -446,7 +446,7 @@ consvar_t cv_kartrings = CVAR_INIT ("kartrings", "No", CV_NETVAR|CV_CALL|CV_NOIN // Stacking related consvar_t cv_kartstacking = CVAR_INIT ("kartstacking", "No", CV_NETVAR|CV_CALL|CV_NOINIT, CV_YesNo, KartStacking_OnChange); -consvar_t cv_kartstacking_calc_arg_offset = CVAR_INIT ("kartstacking_calcargoffset", "0.32", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); +consvar_t cv_kartstacking_diminishparam = CVAR_INIT ("kartstacking_diminishparam", "0.32", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); consvar_t cv_kartstacking_maxvanillaboost = CVAR_INIT ("kartstacking_maxvanillaboost", "0.375", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); consvar_t cv_kartstacking_speedboostdropoff = CVAR_INIT ("kartstacking_speedboostdropoff", "0.01", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); consvar_t cv_kartstacking_speedboostdropoff_brake = CVAR_INIT ("kartstacking_speedboostdropoff_brake", "0.05", CV_NETVAR|CV_CHEAT|CV_FLOAT, CV_Unsigned, NULL); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index e23549def..4f32fed27 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -122,7 +122,7 @@ extern consvar_t cv_kartusepwrlv; extern consvar_t cv_kartrings; extern consvar_t cv_kartstacking; -extern consvar_t cv_kartstacking_calc_arg_offset; +extern consvar_t cv_kartstacking_diminishparam; extern consvar_t cv_kartstacking_maxvanillaboost; extern consvar_t cv_kartstacking_speedboostdropoff; extern consvar_t cv_kartstacking_speedboostdropoff_brake; diff --git a/src/k_kart.c b/src/k_kart.c index 958f177c3..33e7aff26 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -283,7 +283,7 @@ void K_RegisterKartStuff(void) // Stacking CV_RegisterVar(&cv_kartstacking); - CV_RegisterVar(&cv_kartstacking_calc_arg_offset); + CV_RegisterVar(&cv_kartstacking_diminishparam); CV_RegisterVar(&cv_kartstacking_speedboostdropoff); CV_RegisterVar(&cv_kartstacking_speedboostdropoff_brake); CV_RegisterVar(&cv_kartstacking_accelstack); @@ -3525,7 +3525,7 @@ static inline fixed_t K_GetSneakerBoostSpeed(void) static fixed_t diminish(fixed_t speedboost) { - return FixedSqrt(speedboost + CALC_ARG_OFFSET) - CALC_RET_OFFSET; + return FixedSqrt(speedboost + DIMINISHPARAM) - FixedSqrt(DIMINISHPARAM); } void K_DoBoost(player_t *player, fixed_t speedboost, fixed_t accelboost, boolean stack, boolean visible) diff --git a/src/k_kart.h b/src/k_kart.h index 068f12af5..827893f49 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -39,8 +39,7 @@ Make sure this matches the actual number of states // Precalculated constants for stacked boost diminishing // *Somewhat* matches old calc but doesn't use arrays, which makes it faster and more memory efficent -#define CALC_ARG_OFFSET K_RAGuard(cv_kartstacking_calc_arg_offset) -#define CALC_RET_OFFSET FixedSqrt(CALC_ARG_OFFSET) +#define DIMINISHPARAM K_RAGuard(cv_kartstacking_diminishparam) #define MAXVANILLABOOST K_RAGuard(cv_kartstacking_maxvanillaboost) #define SPEEDBOOSTDROPOFF K_RAGuard(cv_kartstacking_speedboostdropoff) #define SPEEDBOOSTDROPOFF_BRAKE K_RAGuard(cv_kartstacking_speedboostdropoff_brake) diff --git a/src/p_mobj.c b/src/p_mobj.c index 38ebb2284..908331875 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -10619,9 +10619,6 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_LANDMINE: case MT_BALLHOG: case MT_SINK: - case MT_THUNDERSHIELD: - case MT_BUBBLESHIELD: - case MT_FLAMESHIELD: case MT_ROCKETSNEAKER: case MT_SPB: case MT_ADVENTURESPIKEA: @@ -10649,6 +10646,9 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_ITEMCAPSULE: thing->shadowscale = FRACUNIT/2; break; + case MT_THUNDERSHIELD: + case MT_BUBBLESHIELD: + case MT_FLAMESHIELD: case MT_BLUEFRUIT: case MT_ORANGEFRUIT: case MT_REDFRUIT: @@ -10746,7 +10746,7 @@ static void P_DefaultMobjShadowScale(mobj_t *thing) case MT_THROWNEXPLOSION: case MT_THROWNGRENADE: case MT_EMBLEM: - thing->shadowscale = FRACUNIT; + thing->shadowscale = FRACUNIT/3; break; default: if (thing->flags & (MF_ENEMY|MF_BOSS))