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

TIL CV_Guard blocks using CV_Get

Browse source
This commit is contained in:
minenice55 2026-04-25 00:09:59 -04:00
parent 76e7a8c66e
commit 7e2f8963ec
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_collide.c
View file

@ -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
{

1
src/k_kart.h
View file

@ -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)