Fix Escape key handling

This commit is contained in:
2022-08-31 23:50:35 +02:00
parent 8c4d114dad
commit 5d9c7e6de2

View File

@@ -67,11 +67,10 @@ public class GuiManager {
manager.close(); manager.close();
} else { } else {
manager.open(gameMenu); manager.open(gameMenu);
context.pause();
} }
if (manager.size() > 0) { if (manager.isEmpty()) {
context.pause();
} else {
context.resume(); context.resume();
} }
@@ -83,9 +82,9 @@ public class GuiManager {
return manager.size(); return manager.size();
} }
public void showStartMenu() { public CompletableFuture<Window> showStartMenu() {
manager.closeAll(); manager.closeAll();
manager.open(startMenu); return manager.open(startMenu);
} }
public void enableGameMenu() { public void enableGameMenu() {
@@ -101,20 +100,19 @@ public class GuiManager {
} }
public CompletableFuture<Window> showDialog(@NonNull String message, @NonNull WindowPosition position) { public CompletableFuture<Window> showDialog(@NonNull String message, @NonNull WindowPosition position) {
manager.closeAll();
return manager.open(dialog, message, position); return manager.open(dialog, message, position);
} }
public void openLootWindow(@NonNull Enemy enemy) { public CompletableFuture<Window> openLootWindow(@NonNull Enemy enemy) {
manager.closeAll(); return manager.open(loot, enemy.getLoot(), "Loot");
manager.open(loot, enemy.getLoot(), "Loot");
} }
public void openChestWindow(@NonNull Chest chest) { public CompletableFuture<Window> openChestWindow(@NonNull Chest chest) {
manager.closeAll(); return manager.open(loot, chest.getContent(), chest.getName());
}
manager.open(loot, chest.getContent(), chest.getName()); public CompletableFuture<Window> openGameMenu() {
return manager.open(gameMenu);
} }
public void closeAll() { public void closeAll() {