From 3e9933bdd0b246761d8cd0ab70fa3fc6850771d7 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Sat, 1 Mar 2025 01:53:30 +0000 Subject: [PATCH] fix exception with attacking fallingEnemies, by regenerating fallingTree on each collision --- fcore/level/player/player-attack.sml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fcore/level/player/player-attack.sml b/fcore/level/player/player-attack.sml index d31213c..f13dbed 100644 --- a/fcore/level/player/player-attack.sml +++ b/fcore/level/player/player-attack.sml @@ -56,7 +56,6 @@ struct , defeatedList , enemyMap , fallingMap - , fallingTree , enemyTree , pos , boxes @@ -83,6 +82,7 @@ struct val (defeatedList, enemyMap) = PlayerAttackEnemy.foldRegion (x, y, size, size, (), (defeatedList, enemyMap), enemyTree) + val fallingTree = FallingEnemies.generateTree fallingMap val (defeatedList, fallingMap) = PlayerAttackFalling.foldRegion (x, y, size, size, (), (defeatedList, fallingMap), fallingTree) in @@ -91,7 +91,6 @@ struct , defeatedList , enemyMap , fallingMap - , fallingTree , enemyTree , pos + 1 , boxes @@ -108,7 +107,7 @@ struct let open EntityType val frame = amt div 2 - val fallingTree = FallingEnemies.generateTree fallingMap + val boxes = case facing of FACING_RIGHT => Vector.sub (Whip.rightFrames, frame) @@ -119,7 +118,6 @@ struct , [] , enemyMap , fallingMap - , fallingTree , enemyTree , 0 , boxes