Skip to content

Commit 18af6b0

Browse files
committed
Tried to limit player movement while inventory is open
Trying to find a way to implement in which the player does not keep moving while the inventory window is still open
1 parent c60f293 commit 18af6b0

File tree

3 files changed

+43
-12
lines changed

3 files changed

+43
-12
lines changed

src/com/redomar/game/Game.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class Game extends Canvas implements Runnable {
6565
private BufferedImage image2 = new BufferedImage(WIDTH, HEIGHT - 30,
6666
BufferedImage.TYPE_INT_RGB);
6767
private Screen screen;
68-
private InputHandler input;
68+
private static InputHandler input;
6969
private WindowHandler window;
7070
private LevelHandler level;
7171
private Player player;
@@ -514,4 +514,12 @@ public static void setAternateColsS(boolean alternateCols){
514514
Game.alternateCols[0] = alternateCols;
515515
}
516516

517+
public static InputHandler getInput() {
518+
return input;
519+
}
520+
521+
public void setInput(InputHandler input) {
522+
Game.input = input;
523+
}
524+
517525
}

src/com/redomar/game/InputHandler.java

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public void toggle(boolean isPressed) {
3939
private Printing print = new Printing();
4040
private boolean PlayMusic = false;
4141
private int map;
42+
private boolean untoggle = false;
4243

4344
public void keyPressed(KeyEvent e) {
4445
toggleKey(e.getKeyCode(), true);
@@ -53,17 +54,24 @@ public void keyTyped(KeyEvent e) {
5354
}
5455

5556
public void toggleKey(int keyCode, boolean isPressed) {
56-
if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
57-
getUp().toggle(isPressed);
58-
}
59-
if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
60-
getDown().toggle(isPressed);
61-
}
62-
if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
63-
getLeft().toggle(isPressed);
64-
}
65-
if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
66-
getRight().toggle(isPressed);
57+
if(untoggle == false){
58+
if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) {
59+
getUp().toggle(isPressed);
60+
}
61+
if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) {
62+
getDown().toggle(isPressed);
63+
}
64+
if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) {
65+
getLeft().toggle(isPressed);
66+
}
67+
if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) {
68+
getRight().toggle(isPressed);
69+
}
70+
}else{
71+
getUp().toggle(false);
72+
getDown().toggle(false);
73+
getLeft().toggle(false);
74+
getRight().toggle(false);
6775
}
6876
if (keyCode == KeyEvent.VK_M) {
6977
this.setPlayMusic(true);
@@ -103,6 +111,11 @@ public void toggleKey(int keyCode, boolean isPressed) {
103111
System.exit(1);
104112
}
105113
}
114+
115+
public void untoggle(boolean toggle){
116+
this.untoggle = toggle;
117+
}
118+
106119

107120
public int getMap() {
108121
return map;
@@ -152,4 +165,12 @@ public void setRight(Key right) {
152165
this.right = right;
153166
}
154167

168+
public boolean isUntoggle() {
169+
return untoggle;
170+
}
171+
172+
public void setUntoggle(boolean untoggle) {
173+
this.untoggle = untoggle;
174+
}
175+
155176
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ public static void activate() {
1818
System.out.println("Opened\nInside this Bag their is:"+inside());
1919
open = true;
2020
Game.getPlayer().setMoving(false);
21+
//Game.getInput().untoggle(true);
2122
inv_window.start();
2223
}
2324
}else{
2425
if(open){
2526
open = false;
27+
//Game.getInput().untoggle(false);
2628
inv_window.stop();
2729
inv_window.getFrame().setVisible(false);
2830
inv_window.getFrame().stopFrame();

0 commit comments

Comments
 (0)