summaryrefslogtreecommitdiff
path: root/src/code/z_fireobj.c
diff options
context:
space:
mode:
authorengineer124 <engineer124engineer124@gmail.com>2023-06-11 01:34:53 +1000
committerengineer124 <engineer124engineer124@gmail.com>2023-06-11 01:34:53 +1000
commit5fc0024b72622125a689aa5ae080337fe578f1ff (patch)
tree656ce93b5d46e86ed453980019f2110c877dd869 /src/code/z_fireobj.c
parent3dd8096af5af84fab0cd3a664d3e1e888224274d (diff)
parent47be99fb0cde762466ab8dd7d2471dd278a59040 (diff)
Merge branch 'master' into parameter
Diffstat (limited to 'src/code/z_fireobj.c')
-rw-r--r--src/code/z_fireobj.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c
index 5565bc876..98d14874b 100644
--- a/src/code/z_fireobj.c
+++ b/src/code/z_fireobj.c
@@ -67,8 +67,7 @@ void FireObj_StepSize(FireObj* fire) {
if (Math_StepToF(&fire->dynamicSize, 1.0f, fire->dynamicSizeStep)) {
FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_FULLY_LIT);
}
- } else if ((fire->state == FIRE_STATE_SHRINKING) &&
- (Math_StepToF(&fire->dynamicSize, 0.0f, fire->dynamicSizeStep))) {
+ } else if ((fire->state == FIRE_STATE_SHRINKING) && Math_StepToF(&fire->dynamicSize, 0.0f, fire->dynamicSizeStep)) {
FireObj_SetState(fire, fire->dynamicSizeStep, FIRE_STATE_NOT_LIT);
}
if (fire->sizeGrowsCos2 == 1) {