remove unused 'enemyTree' value returned from player-enemy.sml function
This commit is contained in:
@@ -9,7 +9,7 @@ struct
|
|||||||
val enemyTree = Enemy.generateTree enemies
|
val enemyTree = Enemy.generateTree enemies
|
||||||
|
|
||||||
(* check player-enemy collisions and react *)
|
(* check player-enemy collisions and react *)
|
||||||
val (player, enemies, enemyTree) =
|
val (player, enemies) =
|
||||||
PlayerEnemy.checkCollisions
|
PlayerEnemy.checkCollisions
|
||||||
(player, enemies, enemyTree, #projectiles player)
|
(player, enemies, enemyTree, #projectiles player)
|
||||||
in
|
in
|
||||||
|
|||||||
@@ -114,7 +114,6 @@ struct
|
|||||||
, projectileTree
|
, projectileTree
|
||||||
, []
|
, []
|
||||||
)
|
)
|
||||||
val enemyTree = Enemy.generateTree enemies
|
|
||||||
|
|
||||||
(* add collided enemies to player record,
|
(* add collided enemies to player record,
|
||||||
* concatenating with the previous enemies defeated *)
|
* concatenating with the previous enemies defeated *)
|
||||||
@@ -124,7 +123,7 @@ struct
|
|||||||
val allDefeated = Vector.concat [oldDefeated, newDefeated]
|
val allDefeated = Vector.concat [oldDefeated, newDefeated]
|
||||||
val player = Player.withPatches (player, [W_ENEMIES allDefeated])
|
val player = Player.withPatches (player, [W_ENEMIES allDefeated])
|
||||||
in
|
in
|
||||||
(player, enemies, enemyTree)
|
(player, enemies)
|
||||||
end
|
end
|
||||||
| _ =>
|
| _ =>
|
||||||
(case attacked of
|
(case attacked of
|
||||||
@@ -140,7 +139,7 @@ struct
|
|||||||
val enemies = filterEnemyProjectiles
|
val enemies = filterEnemyProjectiles
|
||||||
(Vector.length enemies - 1, enemies, projectileTree, [])
|
(Vector.length enemies - 1, enemies, projectileTree, [])
|
||||||
in
|
in
|
||||||
(player, enemies, enemyTree)
|
(player, enemies)
|
||||||
end
|
end
|
||||||
| ATTACKED amt =>
|
| ATTACKED amt =>
|
||||||
if amt = Constants.attackedLimit then
|
if amt = Constants.attackedLimit then
|
||||||
@@ -156,7 +155,7 @@ struct
|
|||||||
val enemies = filterEnemyProjectiles
|
val enemies = filterEnemyProjectiles
|
||||||
(Vector.length enemies - 1, enemies, projectileTree, [])
|
(Vector.length enemies - 1, enemies, projectileTree, [])
|
||||||
in
|
in
|
||||||
(player, enemies, enemyTree)
|
(player, enemies)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
(* if attacked, don't detect collisions,
|
(* if attacked, don't detect collisions,
|
||||||
@@ -171,7 +170,7 @@ struct
|
|||||||
val enemies = filterEnemyProjectiles
|
val enemies = filterEnemyProjectiles
|
||||||
(Vector.length enemies - 1, enemies, projectileTree, [])
|
(Vector.length enemies - 1, enemies, projectileTree, [])
|
||||||
in
|
in
|
||||||
(player, enemies, enemyTree)
|
(player, enemies)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user