From 4f58f61aade190fa8640106e8c8aa8f174cdbfd0 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 11 Aug 2016 14:37:26 -0600 Subject: [PATCH] light: GetLightDist: use entity->getFormula() --- light/ltface.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/light/ltface.cc b/light/ltface.cc index e79bbab6..1f471b88 100644 --- a/light/ltface.cc +++ b/light/ltface.cc @@ -934,14 +934,14 @@ float GetLightDist(const light_t *entity, vec_t desiredLight) { float fadedist; - if (entity->formula.intValue() == LF_LINEAR) { + if (entity->getFormula() == LF_LINEAR) { /* Linear formula always has a falloff point */ fadedist = fabs(entity->light.floatValue()) - desiredLight; fadedist = fadedist / entity->atten.floatValue() / scaledist.floatValue(); fadedist = qmax(0.0f, fadedist); } else { /* Calculate the distance at which brightness falls to desiredLight */ - switch (entity->formula.intValue()) { + switch (entity->getFormula()) { case LF_INFINITE: case LF_LOCALMIN: fadedist = VECT_MAX; @@ -952,7 +952,7 @@ GetLightDist(const light_t *entity, vec_t desiredLight) case LF_INVERSE2: case LF_INVERSE2A: fadedist = sqrt(fabs(entity->light.floatValue() * SQR(LF_SCALE) / (SQR(scaledist.floatValue()) * SQR(entity->atten.floatValue()) * desiredLight))); - if (entity->formula.intValue() == LF_INVERSE2A) { + if (entity->getFormula() == LF_INVERSE2A) { fadedist -= (LF_SCALE / (scaledist.floatValue() * entity->atten.floatValue())); } fadedist = qmax(0.0f, fadedist);