From 442c489af7414657ddd2358addc3d8d26fba0df8 Mon Sep 17 00:00:00 2001 From: Humza Shahid Date: Sun, 12 Jan 2025 19:31:29 +0000 Subject: [PATCH] remove unused 'enemyTree' value returned from player-enemy.sml function --- fcore/game-update.sml | 2 +- fcore/player-enemy.sml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fcore/game-update.sml b/fcore/game-update.sml index d6395cd..751f4c6 100644 --- a/fcore/game-update.sml +++ b/fcore/game-update.sml @@ -9,7 +9,7 @@ struct val enemyTree = Enemy.generateTree enemies (* check player-enemy collisions and react *) - val (player, enemies, enemyTree) = + val (player, enemies) = PlayerEnemy.checkCollisions (player, enemies, enemyTree, #projectiles player) in diff --git a/fcore/player-enemy.sml b/fcore/player-enemy.sml index ca828d4..7aaf5ed 100644 --- a/fcore/player-enemy.sml +++ b/fcore/player-enemy.sml @@ -114,7 +114,6 @@ struct , projectileTree , [] ) - val enemyTree = Enemy.generateTree enemies (* add collided enemies to player record, * concatenating with the previous enemies defeated *) @@ -124,7 +123,7 @@ struct val allDefeated = Vector.concat [oldDefeated, newDefeated] val player = Player.withPatches (player, [W_ENEMIES allDefeated]) in - (player, enemies, enemyTree) + (player, enemies) end | _ => (case attacked of @@ -140,7 +139,7 @@ struct val enemies = filterEnemyProjectiles (Vector.length enemies - 1, enemies, projectileTree, []) in - (player, enemies, enemyTree) + (player, enemies) end | ATTACKED amt => if amt = Constants.attackedLimit then @@ -156,7 +155,7 @@ struct val enemies = filterEnemyProjectiles (Vector.length enemies - 1, enemies, projectileTree, []) in - (player, enemies, enemyTree) + (player, enemies) end else (* if attacked, don't detect collisions, @@ -171,7 +170,7 @@ struct val enemies = filterEnemyProjectiles (Vector.length enemies - 1, enemies, projectileTree, []) in - (player, enemies, enemyTree) + (player, enemies) end) end end