ueb02.2c
This commit is contained in:
parent
fc1375dd0e
commit
427c3be269
@ -18,9 +18,8 @@ import fr.enssat.BoulderDash.controllers.GameController;
|
|||||||
public class NavigationBetweenViewController implements ActionListener {
|
public class NavigationBetweenViewController implements ActionListener {
|
||||||
private LevelEditorController levelEditorController;
|
private LevelEditorController levelEditorController;
|
||||||
private MenuView menuView;
|
private MenuView menuView;
|
||||||
private AudioLoadHelper audioLoadHelper;
|
private final AudioLoadHelper audioLoadHelper;
|
||||||
private LevelModel levelModelForGame, levelModelForEditor;
|
private GameController gameController;
|
||||||
private GameController gameController;
|
|
||||||
private String pickedLevelIdentifier;
|
private String pickedLevelIdentifier;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -50,8 +49,8 @@ public class NavigationBetweenViewController implements ActionListener {
|
|||||||
|
|
||||||
case "editor":
|
case "editor":
|
||||||
// New blank model for editor
|
// New blank model for editor
|
||||||
this.levelModelForEditor = new LevelModel(audioLoadHelper);
|
LevelModel levelModelForEditor = new LevelModel(audioLoadHelper);
|
||||||
this.levelEditorController = new LevelEditorController(this.levelModelForEditor, this);
|
this.levelEditorController = new LevelEditorController(levelModelForEditor, this);
|
||||||
|
|
||||||
this.levelEditorController.getLevelEditorView().setVisible(true);
|
this.levelEditorController.getLevelEditorView().setVisible(true);
|
||||||
this.levelEditorController.getLevelEditorView().getLevelEditorGroundView().grabFocus();
|
this.levelEditorController.getLevelEditorView().getLevelEditorGroundView().grabFocus();
|
||||||
@ -66,7 +65,7 @@ public class NavigationBetweenViewController implements ActionListener {
|
|||||||
// Reinit the levelModelForGame...
|
// Reinit the levelModelForGame...
|
||||||
pickedLevelIdentifier = this.menuView.getLevelIdentifier();
|
pickedLevelIdentifier = this.menuView.getLevelIdentifier();
|
||||||
|
|
||||||
this.levelModelForGame = new LevelModel(pickedLevelIdentifier, audioLoadHelper);
|
LevelModel levelModelForGame = new LevelModel(pickedLevelIdentifier, audioLoadHelper);
|
||||||
this.gameController = new GameController(levelModelForGame, audioLoadHelper, this);
|
this.gameController = new GameController(levelModelForGame, audioLoadHelper, this);
|
||||||
|
|
||||||
if (levelEditorController != null) {
|
if (levelEditorController != null) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user