Improved the way the player stops

Restuctured they code that stops the player while inventory window opens
Player still animated while stopped - imporvement needed

Author: redomar

src/com/redomar/game/menu/DedicatedJFrame.java

@@ -29,6 +29,10 @@ public DedicatedJFrame(int WIDTH, int HEIGHT, int SCALE, String NAME) {
 	public JFrame getFrame() {
 		return frame;
 	}
+	
+	public static JFrame getFrameStatic(){
+		return frame;
+	}
 
 	public void setFrame(JFrame frame) {
 		DedicatedJFrame.frame = frame;

src/com/redomar/game/objects/Inventory.java

@@ -7,32 +7,49 @@ public class Inventory {
 	public static int x;
 	public static int y;
 	public static boolean open = false;
+	public static boolean closing;
+	public static boolean reset;
 	private static InventoryWindow inv_window = new InventoryWindow();
-	
+
 	public static void activate() {
 		x = Game.getPlayer().getX();
 		y = Game.getPlayer().getY();
-		
-		if(Game.getLevel().getTile(x >> 3, y >> 3).getId() == 8){
-			if(!open){
-				System.out.println("Opened\nInside this Bag their is:"+inside());
-				open = true;
-				Game.getPlayer().setMoving(false);
-				//Game.getInput().untoggle(true);
-				inv_window.start();
+
+		if (Game.getLevel().getTile(x >> 3, y >> 3).getId() == 8) {
+			if (!reset) {
+				if (!open) {
+					if (!closing) {
+						System.out.println("Opened\nInside this Bag their is:"
+								+ inside());
+						open = true;
+						Game.getPlayer().setMoving(false);
+						Game.getInput().untoggle(true);
+						inv_window.start();
+					}
+				} else {
+					if (closing) {
+						Game.getPlayer().setMoving(true);
+						Game.getInput().untoggle(false);
+						inv_window.stop();
+						inv_window.getFrame().setVisible(false);
+						inv_window.getFrame().stopFrame();
+						if (Game.getLevel().getTile(x >> 3, y >> 3).getId() == 8) {
+							reset = true;
+							System.out.println("rest");
+						}
+					}
+				}
 			}
-		}else{
-			if(open){
+		} else {
+			if (open == true || reset == true || closing == true) {
+				reset = false;
 				open = false;
-				//Game.getInput().untoggle(false);
-				inv_window.stop();
-				inv_window.getFrame().setVisible(false);
-				inv_window.getFrame().stopFrame();
+				closing = false;
 			}
 		}
 	}
-	
-	private static String inside(){
+
+	private static String inside() {
 		String items = " ";
 		for (Items item : Items.values()) {
 			items = items + item.toString() + ", ";

src/com/redomar/game/objects/InventoryHandler.java

@@ -0,0 +1,53 @@
+package com.redomar.game.objects;
+
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import com.redomar.game.menu.DedicatedJFrame;
+
+public class InventoryHandler implements WindowListener {
+	
+	@SuppressWarnings("unused")
+	private DedicatedJFrame frame;
+	
+	public InventoryHandler(DedicatedJFrame frame) {
+		this.frame = frame;
+		DedicatedJFrame.getFrameStatic().addWindowListener(this);
+	}
+
+	@Override
+	public void windowActivated(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowClosed(WindowEvent e) {
+		
+	}
+
+	public void windowClosing(WindowEvent e) {
+		Inventory.closing = true;
+		System.out.println("CLOSING");
+	}
+
+	@Override
+	public void windowDeactivated(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowDeiconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowIconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowOpened(WindowEvent e) {
+		
+	}
+
+}

src/com/redomar/game/objects/InventoryWindow.java

@@ -16,6 +16,7 @@ public class InventoryWindow implements Runnable{
 	private static boolean running = false;
 
 	private static DedicatedJFrame frame;
+	private static InventoryHandler window;
 
 	public synchronized void start(){
 		running = true;
@@ -36,6 +37,8 @@ public void run() {
 
 		long lastTimer = System.currentTimeMillis();
 		double delta = 0;
+		
+		setWindow(new InventoryHandler(getFrame()));
 
 		while (running) {
 			long now = System.nanoTime();
@@ -93,4 +96,12 @@ public DedicatedJFrame getFrame() {
 	public static void setFrame(DedicatedJFrame frame) {
 		InventoryWindow.frame = frame;
 	}
+
+	public static InventoryHandler getWindow() {
+		return window;
+	}
+
+	public static void setWindow(InventoryHandler inventoryHandler) {
+		InventoryWindow.window = inventoryHandler;
+	}
 }