From 7e2f8963ec096a25c8bd17811a92cab2bbdc8c6e Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 25 Apr 2026 00:09:59 -0400 Subject: [PATCH] TIL CV_Guard blocks using CV_Get --- src/k_collide.c | 4 ++-- src/k_kart.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index 8819d7fd4..7442a5936 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -697,7 +697,7 @@ static inline BlockItReturn_t PIT_AttractionShieldAttack(mobj_t *thing) return BMIT_ABORT; } - if (thing->player && (ATTRACTIONAOEDAMAGE == 0 || (!attractionhipower))) + if (thing->player && (cv_kartattraction_aoedmg.value == 0 || (!attractionhipower))) { // Don't damage players return BMIT_CONTINUE; @@ -744,7 +744,7 @@ static inline BlockItReturn_t PIT_AttractionShieldAttack(mobj_t *thing) if (thing->player) { - P_DamageMobj(thing, lightningSource, lightningSource, 1, ATTRACTIONAOEDAMAGE|DMG_CANTHURTSELF); + P_DamageMobj(thing, lightningSource, lightningSource, 1, (cv_kartattraction_aoedmg.value)|DMG_CANTHURTSELF); } else { diff --git a/src/k_kart.h b/src/k_kart.h index d10be0e76..841dd0905 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -139,7 +139,6 @@ extern vector3_t clusterpoint, clusterdtf; #define FLAMEHANDLEBOOST CV_Get(&cv_kartstacking_flame_handleboost) #define FLAMESTACKABLE CV_Get(&cv_kartstacking_flame_stackable) -#define ATTRACTIONAOEDAMAGE CV_Get(&cv_kartattraction_aoedmg) #define ATTRACTIONSPEEDHIMIN CV_Get(&cv_kartstacking_attraction_speedboost_himin) #define ATTRACTIONSPEEDHIMAX CV_Get(&cv_kartstacking_attraction_speedboost_himax) #define ATTRACTIONSPEEDNORMMIN CV_Get(&cv_kartstacking_attraction_speedboost_normmin)