Skip to content

Commit d153d4c

Browse files
committed
input:
- fix clashes in default keys and navigation keys
1 parent 55f6c4b commit d153d4c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"rotate_left": "Left",
1313
"rotate_right": "Right",
1414
"menu": {
15-
"pause": "Escape",
15+
"pause": "Space",
1616
"open_settings": "P"
1717
}
1818
},

src/input/keyboard_input.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "SDL_keycode.h"
34
#include "game_input.hpp"
45
#include "helper/expected.hpp"
56
#include "helper/parse_json.hpp"
@@ -49,7 +50,7 @@ namespace input {
4950
.move_down = sdl::Key{ SDLK_s },
5051
.drop = sdl::Key{ SDLK_w },
5152
.hold = sdl::Key{ SDLK_TAB },
52-
.pause = sdl::Key{ SDLK_ESCAPE },
53+
.pause = sdl::Key{ SDLK_SPACE },
5354
.open_settings = sdl::Key{ SDLK_e } };
5455
}
5556
};

0 commit comments

Comments
 (0)