> t = p.AnalyseSituation();
+ p.Execution(t);
recupererInformations();
}
-
+ afficheTous();
// bloquer le tour jusqu'a toucher une touche du clavier.
Scanner s = new Scanner(System.in);
s.nextLine();
diff --git a/src/utils/InterfaceConsole.java b/src/utils/InterfaceConsole.java
index 315e7c2..8862f1d 100644
--- a/src/utils/InterfaceConsole.java
+++ b/src/utils/InterfaceConsole.java
@@ -10,12 +10,12 @@ public class InterfaceConsole {
}
public void afficherPlateau() {
- for (int i = 0; i < plateau.length; i++) {
- for (int j = 0; j < plateau[i].length; j++) {
- if (plateau[i][j].getOccupant() != null) {
- System.out.print(plateau[i][j].getOccupant().getNom().charAt(0) + " | ");
+ for (CaseAbstraite[] aPlateau : plateau) {
+ for (CaseAbstraite anAPlateau : aPlateau) {
+ if (anAPlateau.getOccupant() != null) {
+ System.out.print(anAPlateau.getOccupant().getNom().charAt(0) + " | ");
} else {
- System.out.print(" " + plateau[i][j].affichageSpecial() + " | ");
+ System.out.print(" " + anAPlateau.affichageSpecial() + " | ");
}
}
System.out.println();
diff --git a/src/utils/Tuple.java b/src/utils/Tuple.java
new file mode 100644
index 0000000..ff7b5cb
--- /dev/null
+++ b/src/utils/Tuple.java
@@ -0,0 +1,13 @@
+package utils;
+
+public class Tuple {
+ public final P p;
+ public final O o;
+ public final C c;
+
+ public Tuple(P p, O o, C c) {
+ this.p = p;
+ this.o = o;
+ this.c = c;
+ }
+}
\ No newline at end of file