School-DUT-info/M431-ShadowHunterGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

Browse Source
This commit is contained in:
Paul Gross
2020-05-07 16:58:36 +02:00
parent 144ffd5434 a2bc3f1dd4
commit 892dd6da73
6 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ihm/controller/PlateauController.java
View File

@@ -38,6 +38,7 @@ public class PlateauController implements Initializable {
@FXML private AnchorPane rootPane;
@FXML private GridPane gridPaneVie;
@FXML public GridPane gridPaneLieux;
private ChoisirBoolean cb;
@@ -51,7 +52,7 @@ public class PlateauController implements Initializable {
@Override
public void initialize(URL arg0, ResourceBundle arg1) {
//System.out.println("Création du plateau ...");
this.joueursIHM = new ArrayList<JoueurIHM>();
GestionnaireJeu gj = GestionnaireJeu.getGestionnaireJeu();
Map<Integer, Joueur> map = gj.getMapJoueurs();
@@ -61,6 +62,7 @@ public class PlateauController implements Initializable {
Pane p = (Pane) gridPaneVie.getChildren().get(i);
Label l = (Label) p.getChildren().get(1);
l.setText(i+"");
}
for(int i : map.keySet()) {
@@ -159,6 +161,7 @@ public class PlateauController implements Initializable {
}
private Pane getPaneJoueur(int i) {
System.out.println("i "+i);
@@ -303,7 +306,7 @@ public class PlateauController implements Initializable {
EffetSonore.playSoundEffect(fileSound1);
System.out.println("Jeu en pause ...");
final URL fxmlURL = getClass().getResource("../ressources/Pause.fxml");
final URL fxmlURL = getClass().getResource("/ihm/ressources/Pause.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Pane root = (Pane)fxmlLoader.load();