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

correction d'une erreure

Browse Source
This commit is contained in:
Bastien NOEL 2020-05-11 17:45:28 +02:00
parent 5d9ba89bed
commit 5cb64604e5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effet/EffetChoisirEffet.java
View File

@ -19,7 +19,7 @@ public class EffetChoisirEffet extends Effet{
@Override @Override
public void utiliser(Joueur joueur) { public void utiliser(Joueur joueur) {
Effet effet = (Effet) joueur.choisir(effets); Effet effet = (Effet) joueur.choisir(effets,Effet.class);
effet.utiliser(joueur); effet.utiliser(joueur);
} }

6
src/ihm/controller/PauseController.java
View File

@ -169,14 +169,16 @@ public class PauseController implements Initializable {
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle); final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
AnchorPane pane = fxmlLoader.load(); AnchorPane pane = fxmlLoader.load();
/*
Scene scene = new Scene(pane); Scene scene = new Scene(pane);
Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow(); Stage appStage = (Stage) ((Node) mouseEvent.getSource()).getScene().getWindow();
appStage.setScene(scene); appStage.setScene(scene);
appStage.show(); appStage.show();
*/
/*
PopUp pu = new PopUp(pane, "Regles"); PopUp pu = new PopUp(pane, "Regles");
pu.display(); pu.display();
*/
} }

2
src/ihm/ressources/ReglesPause.fxml
View File

@ -8,7 +8,7 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.ReglesControlleurPause"> <AnchorPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.ReglesControlleur">
<children> <children>
<VBox alignment="CENTER" layoutX="-3.0" layoutY="-7.0" prefHeight="802.0" prefWidth="1290.0"> <VBox alignment="CENTER" layoutX="-3.0" layoutY="-7.0" prefHeight="802.0" prefWidth="1290.0">
<children> <children>