Skip to content

Commit cd410d1

Browse files
committed
Setting default keyboard focus
Also added space key as an input method
1 parent ab7fe15 commit cd410d1

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

src/com/redomar/game/Game.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public Game() {
9494
getFrame().setLocationRelativeTo(null);
9595
getFrame().setVisible(true);
9696

97+
requestFocus();
9798
setDevMode(false);
9899
setClosing(false);
99100
}
@@ -172,6 +173,25 @@ public static int getMap() {
172173
return map;
173174
}
174175

176+
public void setMap(String Map_str) {
177+
setLevel(new LevelHandler(Map_str));
178+
if (alternateCols[0]) {
179+
Game.setShirtCol(240);
180+
}
181+
if (!alternateCols[0]) {
182+
Game.setShirtCol(111);
183+
}
184+
if (alternateCols[1]) {
185+
Game.setFaceCol(310);
186+
}
187+
if (!alternateCols[1]) {
188+
Game.setFaceCol(543);
189+
}
190+
setPlayer(new Player(level, 100, 100, input,
191+
getJdata_UserName(), shirtCol, faceCol));
192+
level.addEntity(player);
193+
}
194+
175195
public static void setMap(int map) {
176196
Game.map = map;
177197
}
@@ -284,25 +304,6 @@ public static void setClosing(boolean closing) {
284304
Game.closingMode = closing;
285305
}
286306

287-
public void setMap(String Map_str) {
288-
setLevel(new LevelHandler(Map_str));
289-
if (alternateCols[0]) {
290-
Game.setShirtCol(240);
291-
}
292-
if (!alternateCols[0]) {
293-
Game.setShirtCol(111);
294-
}
295-
if (alternateCols[1]) {
296-
Game.setFaceCol(310);
297-
}
298-
if (!alternateCols[1]) {
299-
Game.setFaceCol(543);
300-
}
301-
setPlayer(new Player(level, 100, 100, input,
302-
getJdata_UserName(), shirtCol, faceCol));
303-
level.addEntity(player);
304-
}
305-
306307
public void init() {
307308
setGame(this);
308309
int index = 0;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public static void play() {
111111
frame = new DedicatedJFrame(WIDTH, HEIGHT, SCALE, NAME);
112112
frame.getFrame();
113113
frame.getFrame().setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
114+
frame.requestFocus();
114115
} catch (Exception e) {
115116
e.printStackTrace();
116117
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private void toggleKey(int keyCode) {
3434
}
3535

3636
if(!ticket){
37-
if (keyCode == KeyEvent.VK_ENTER) {
37+
if (keyCode == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_SPACE) {
3838
if (Menu.isSelectedStart()) {
3939
this.ticket = true;
4040
Menu.setRunning(false);

0 commit comments

Comments
 (0)