From c0c90445ec8bea389490cea2671fe9e4fc062b20 Mon Sep 17 00:00:00 2001
From: Amaury Joly <joly.amaury@hotmail.fr>
Date: Wed, 16 Dec 2020 17:28:49 +0100
Subject: [PATCH] Correction bug de quand il meurt sur les corde

---
 src/modele/calculs/Controle4Directions.java              | 5 ++++-
 src/modele/calculs/{MenuInput.java => ControleMenu.java} | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename src/modele/calculs/{MenuInput.java => ControleMenu.java} (100%)

diff --git a/src/modele/calculs/Controle4Directions.java b/src/modele/calculs/Controle4Directions.java
index d48e8a5..1ff0449 100644
--- a/src/modele/calculs/Controle4Directions.java
+++ b/src/modele/calculs/Controle4Directions.java
@@ -23,6 +23,7 @@ public class Controle4Directions extends RealisateurDeDeplacement {
         directionCourante = _directionCourante;
     }
 
+    @Override
     public boolean realiserDeplacement() {
         boolean ret = false;
         for (ElementDynamique e : lstEntitesDynamiques) {
@@ -36,8 +37,10 @@ public class Controle4Directions extends RealisateurDeDeplacement {
                     case bas:
                     case haut:
                         ElementFond ef = ((Entite) e).regarderDerriereSoit();
+                        ElementPhysique eP = ((Entite) e).regarderDansLaDirection(directionCourante);
 
-                        if(ef != null && ef.peutPermettreDeMonterDescendre()) {
+                        if((ef != null && ef.peutPermettreDeMonterDescendre())
+                                && (eP == null || !eP.peutServirDeSupport())) {
                             ret = e.avancerDirectionChoisie(directionCourante);
                         }
                         break;
diff --git a/src/modele/calculs/MenuInput.java b/src/modele/calculs/ControleMenu.java
similarity index 100%
rename from src/modele/calculs/MenuInput.java
rename to src/modele/calculs/ControleMenu.java