From 41140798b84ffb0f0eace256dacc02fd5b661da9 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Fri, 12 Aug 2022 14:58:45 +0000 Subject: [PATCH] fix null error in GroupTools --- .../src/kiss_flixel/GroupTools.kiss | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/projects/kiss-flixel/src/kiss_flixel/GroupTools.kiss b/projects/kiss-flixel/src/kiss_flixel/GroupTools.kiss index a20f86b0..fb05b4af 100644 --- a/projects/kiss-flixel/src/kiss_flixel/GroupTools.kiss +++ b/projects/kiss-flixel/src/kiss_flixel/GroupTools.kiss @@ -18,21 +18,22 @@ (function :FlxRect calculateScreenBounds <>[:FlxSprite T] [:FlxTypedGroup group &opt :FlxCamera camera :Float margin] (unless margin (set margin 0)) - (let [s (group.getFirstAlive) - r (new FlxRect) - bounds (s.getScreenBounds r camera) - &mut minX bounds.left - &mut maxX bounds.right - &mut minY bounds.top - &mut maxY bounds.bottom] - - (group.forEach ->sprite - (let [bounds (sprite.getScreenBounds r camera)] - (setMin minX bounds.left) - (setMin minY bounds.top) - (setMax maxX bounds.right) - (setMax maxY bounds.bottom))) + (ifLet [s (group.getFirstAlive)] + (let [r (new FlxRect) + bounds (s.getScreenBounds r camera) + &mut minX bounds.left + &mut maxX bounds.right + &mut minY bounds.top + &mut maxY bounds.bottom] + + (group.forEach ->sprite + (let [bounds (sprite.getScreenBounds r camera)] + (setMin minX bounds.left) + (setMin minY bounds.top) + (setMax maxX bounds.right) + (setMax maxY bounds.bottom))) - (r.fromTwoPoints - (new FlxPoint (- minX margin) (- minY margin)) - (new FlxPoint (+ maxX margin) (+ maxY margin))))) \ No newline at end of file + (r.fromTwoPoints + (new FlxPoint (- minX margin) (- minY margin)) + (new FlxPoint (+ maxX margin) (+ maxY margin)))) + (new FlxRect 0 0 0 0))) \ No newline at end of file