From 8aa6c9dc5a66b9f1ad71e06c9e9de779915e3771 Mon Sep 17 00:00:00 2001 From: Mathieu Huot Date: Sat, 9 Jan 2016 17:43:16 +0100 Subject: [PATCH] fixed when game leaves, play-term in makefile --- Makefile | 2 +- src/graphics/guiSkeleton/GraphicsMaster.java | 1 - .../ingame_input_listener/InputConfiguration.java | 12 ++++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index cbc127c..422050a 100644 --- a/Makefile +++ b/Makefile @@ -103,4 +103,4 @@ play: cd bin/; java -cp $(LIB)*:. graphics.guiSkeleton.Igniter_Main & play-term: - cd bin/; java -cp $(LIB)*:. graphics.termSkeleton.Igniter_Main_Term & + cd bin/; java -cp $(LIB)*:. graphics.termSkeleton.Igniter_Main_Term diff --git a/src/graphics/guiSkeleton/GraphicsMaster.java b/src/graphics/guiSkeleton/GraphicsMaster.java index 6bd5eb5..c291513 100644 --- a/src/graphics/guiSkeleton/GraphicsMaster.java +++ b/src/graphics/guiSkeleton/GraphicsMaster.java @@ -39,7 +39,6 @@ public class GraphicsMaster extends GraphicsMasterAbstraction { private MainFrame mainFrame; private GraphicsMaster() { - super.mainFrame=mainFrame; mapGUIStatesToGUIPanel.put(GUIStates.UNINITIALISED, new UnitialisedGUIPanel(this)); mapGUIStatesToGUIPanel.put(GUIStates.MAIN_MENU, new MainMenuPanel(this)); mapGUIStatesToGUIPanel.put(GUIStates.GAME_PANEL, new GamePanel(this)); diff --git a/src/graphics/ingame_input_listener/InputConfiguration.java b/src/graphics/ingame_input_listener/InputConfiguration.java index f8d03a1..44719b6 100644 --- a/src/graphics/ingame_input_listener/InputConfiguration.java +++ b/src/graphics/ingame_input_listener/InputConfiguration.java @@ -1,17 +1,17 @@ package graphics.ingame_input_listener; -import logging.Logging; import assets.UsedForLoadingSprites; +import logging.Logging; import java.awt.event.KeyEvent; -import java.io.*; -import java.lang.reflect.Array; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -103,13 +103,12 @@ public class InputConfiguration { */ public static void UpdateConfigurationWhenGameLeaves(){ - - //List configurationText=new ArrayList<>(); int numberOfInput=9; int LineToWrite=0; //2*numberOfInput because there are terminal and graphical versions String[] configurationText = new String[2*numberOfInput]; Charset utf8 = StandardCharsets.UTF_8; + //Updating Configuration text w.r.t current inputs before leaving the game //First graphical version inputs configurationText[LineToWrite]=GetFormalInputString(Input.UP_ARROW); @@ -148,6 +147,7 @@ public class InputConfiguration { configurationText[LineToWrite]=String.valueOf(Character.toChars(ability3_terminal)); LineToWrite++; configurationText[LineToWrite]=String.valueOf(Character.toChars(escape_terminal)); + //Finally converting the array configurationText to a big string which is to replace configuration.txt List lines = Arrays.asList(configurationText); try{ -- GitLab