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

Fix pauseController

Browse Source
This commit is contained in:
Yessine Ben El Bey 2020-05-07 11:32:33 +02:00
parent 77166d9180
commit a3ae506ee7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,6 @@ public class PauseController implements Initializable {
System.err.println("Fin de partie"); System.err.println("Fin de partie");
Stage appStage = (Stage) ((Node) me.getSource()).getScene().getWindow(); Stage appStage = (Stage) ((Node) me.getSource()).getScene().getWindow();
appStage.close(); appStage.close();
<<<<<<< HEAD
/* final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml"); /* final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH); final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH);
@ -111,7 +110,7 @@ public class PauseController implements Initializable {
=======
final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml"); final URL fxmlURL = getClass().getResource("/ihm/ressources/Menu.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH); final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH);
@ -130,6 +129,6 @@ public class PauseController implements Initializable {
public void baisserVolume(MouseEvent mouseEvent) throws IOException{ public void baisserVolume(MouseEvent mouseEvent) throws IOException{
Musique.volumeDown(5.f); Musique.volumeDown(5.f);
System.out.println("on baisse le son"); System.out.println("on baisse le son");
>>>>>>> 9fca28f7bb31a2ae6de169307adf781247bc61a4
} }
} }