[DOC]

TP_SHOOTEMUP/ETUDIANT/Squelette.ml

@@ -62,24 +62,30 @@ let rec gestion fenetre j1 j2 ennemis projectiles score =
   | NormalCommand (action1,action2) ->
 
   (* On résoud les collisions des tirs avec les ennemis *)
-  let (new_ennemis,new_projectiles,points) = traite_collisions_tirs projectiles ennemis
+  let (ennemis_restants,projectiles_restants,points) = traite_collisions_tirs projectiles ennemis
        
      in 
      let new_score = score + points
      in
-     if new_ennemis = []
+
+     (* On regarde si la partie est terminée *)
+     if ennemis_restants = []
      then (Gagne new_score)
      else
        match traite_collision_joueurs j1 j2 ennemis
        with
        | Some j -> (Perdu (j, new_score))
        | None -> 
-	  let (new_j1, projectiles_1) = traite_action action1 A j1 in
-	  let (new_j2, projectiles_2) = traite_action action2 B j2 in
-	  let new_projectiles = projectiles_1 @ projectiles_2 @ new_projectiles in
-	  let depl_ennemis = deplace_ennemis new_ennemis projectiles_2 in
-	  
+
+          (* On traite les actions des joueurs *)
+          let (new_j1, projectiles_j1) = traite_action action1 A j1 in
+	  let (new_j2, projectiles_j2) = traite_action action2 B j2 in          
+	  let new_projectiles = projectiles_j1 @ projectiles_j2 @ projectiles_restants in
+
+          (* On fait déplacer les vaisseaux ennemis *)
+	  let depl_ennemis = deplace_ennemis ennemis_restants new_projectiles in
 	  
+	  (* On affiche le nouvel état du jeu *)
 	  let _ = affiche_jeu fenetre new_j1 new_j2 new_score depl_ennemis new_projectiles
 	  in