From 6ae2b5de51e4a7ab00324ab6e3562d4065e2e33f Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 7 Jun 2020 17:15:00 +0200 Subject: [PATCH] add exit method --- core/src/netwerkprog/game/client/MainGame.java | 6 ++++++ .../game/client/game/map/GameInputProcessor.java | 4 ++++ core/src/netwerkprog/game/util/tree/AbstractTree.java | 4 ++-- core/src/netwerkprog/game/util/tree/BST.java | 2 +- core/src/netwerkprog/game/util/tree/Tree.java | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java index 0714be3..8ee8fa7 100644 --- a/core/src/netwerkprog/game/client/MainGame.java +++ b/core/src/netwerkprog/game/client/MainGame.java @@ -320,6 +320,12 @@ public class MainGame extends Game implements ClientCallback { return map.getWidth(); } + public void exit() { + client.disconnect(); + dispose(); + Gdx.app.exit(); + } + public void setSelectedCharacter(GameCharacter character) { if (!character.isDead()) { this.selectedCharacter = character; diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java index f8d0838..88692a1 100644 --- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java +++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java @@ -128,6 +128,10 @@ public class GameInputProcessor implements InputProcessor { mainGame.chooseHacker(); } + } else if (mainGame.getGamestate() == GAMESTATE.ENDED) { + if (keycode == Input.Keys.ESCAPE) { + mainGame.exit(); + } } return false; } diff --git a/core/src/netwerkprog/game/util/tree/AbstractTree.java b/core/src/netwerkprog/game/util/tree/AbstractTree.java index 7c7c9ee..282340b 100644 --- a/core/src/netwerkprog/game/util/tree/AbstractTree.java +++ b/core/src/netwerkprog/game/util/tree/AbstractTree.java @@ -5,8 +5,8 @@ public abstract class AbstractTree implements Tree { public void inorder() { } - @Override /* Postorder traversal from the root */ - public void postorder() { + @Override /* Post order traversal from the root */ + public void postOrder() { } @Override /* Preorder traversal from the root */ diff --git a/core/src/netwerkprog/game/util/tree/BST.java b/core/src/netwerkprog/game/util/tree/BST.java index 45f1bb0..0711e31 100644 --- a/core/src/netwerkprog/game/util/tree/BST.java +++ b/core/src/netwerkprog/game/util/tree/BST.java @@ -141,7 +141,7 @@ public class BST> extends AbstractTree { * Post order traversal from the root */ @Override - public void postorder() { + public void postOrder() { postorder(root); } diff --git a/core/src/netwerkprog/game/util/tree/Tree.java b/core/src/netwerkprog/game/util/tree/Tree.java index 1e8c9ad..0018038 100644 --- a/core/src/netwerkprog/game/util/tree/Tree.java +++ b/core/src/netwerkprog/game/util/tree/Tree.java @@ -16,7 +16,7 @@ public interface Tree extends Iterable { public void inorder(); /** Postorder traversal from the root */ - public void postorder(); + public void postOrder(); /** Preorder traversal from the root */ public void preorder();