From 5cb64604e522317c428a71196599bb771223e7cd Mon Sep 17 00:00:00 2001 From: Bastien NOEL Date: Mon, 11 May 2020 17:45:28 +0200 Subject: [PATCH] correction d'une erreure --- src/effet/EffetChoisirEffet.java | 2 +- src/ihm/controller/PauseController.java | 6 ++++-- src/ihm/ressources/ReglesPause.fxml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/effet/EffetChoisirEffet.java b/src/effet/EffetChoisirEffet.java index 09ed5e7..f541251 100644 --- a/src/effet/EffetChoisirEffet.java +++ b/src/effet/EffetChoisirEffet.java @@ -19,7 +19,7 @@ public class EffetChoisirEffet extends Effet{ @Override public void utiliser(Joueur joueur) { - Effet effet = (Effet) joueur.choisir(effets); + Effet effet = (Effet) joueur.choisir(effets,Effet.class); effet.utiliser(joueur); } diff --git a/src/ihm/controller/PauseController.java b/src/ihm/controller/PauseController.java index 1d2501b..339a039 100644 --- a/src/ihm/controller/PauseController.java +++ b/src/ihm/controller/PauseController.java @@ -169,14 +169,16 @@ public class PauseController implements Initializable { final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle); AnchorPane pane = fxmlLoader.load(); - /* + Scene scene = new Scene(pane); Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow(); appStage.setScene(scene); appStage.show(); - */ + + /* PopUp pu = new PopUp(pane, "Regles"); pu.display(); + */ } diff --git a/src/ihm/ressources/ReglesPause.fxml b/src/ihm/ressources/ReglesPause.fxml index d393bfd..3b6f506 100644 --- a/src/ihm/ressources/ReglesPause.fxml +++ b/src/ihm/ressources/ReglesPause.fxml @@ -8,7 +8,7 @@ - +