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