tr2/input: change default keybindings

LostArtefacts · Jan 13, 2025 · 0282cdb · 0282cdb
1 parent 46c03cd
commit 0282cdb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -2,6 +2,15 @@
 - added Linux builds and toolchain (#1598)
 - added pause dialog (#1638)
 - added a photo mode feature (#2277)
+- changed default input bindings to let the photo mode binding be compatible with TR1X:
+    | Key                           | Old binding | New binding  |
+    | ----------------------------- | ----------- | ------------ |
+    | Decrease resolution           | Shift+F1    | Shift+F11    |
+    | Increase resolution           | F1          | F11          |
+    | Decrease internal screen size | Shift+F2    | Shift+F10    |
+    | Increase internal screen size | F2          | F10          |
+    | Toggle photo mode             | ---         | F1           |
+    | Toggle photo mode UI          | ---         | H            |
 - fixed showing inventory ring up/down arrows when uncalled for (#2225)
 - fixed Lara never stepping backwards off a step using her right foot (#1602)
 - fixed blood spawning on Lara from gunshots using incorrect positioning data (#2253)

diff --git a/src/libtrx/include/libtrx/game/input/backends/keyboard_tr1.def b/src/libtrx/include/libtrx/game/input/backends/keyboard_tr1.def
@@ -11,10 +11,12 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_STEP_L,            SDL_SCANCODE_DELETE)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_STEP_R,            SDL_SCANCODE_PAGEDOWN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ROLL,              SDL_SCANCODE_END)
 
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_PAUSE,             SDL_SCANCODE_P)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ENTER_CONSOLE,     SDL_SCANCODE_SLASH)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SAVE,              SDL_SCANCODE_F5)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_LOAD,              SDL_SCANCODE_F6)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_PAUSE,             SDL_SCANCODE_P)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_UI,         SDL_SCANCODE_H)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_PHOTO_MODE, SDL_SCANCODE_F1)
 
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_FLY_CHEAT,         SDL_SCANCODE_O)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ITEM_CHEAT,        SDL_SCANCODE_I)
@@ -40,8 +42,6 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_FULLSCREEN, SDL_SCANCODE_UNKNOWN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_FPS,               SDL_SCANCODE_F2)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_BILINEAR,          SDL_SCANCODE_F3)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_PERSPECTIVE,       SDL_SCANCODE_F4)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_UI,         SDL_SCANCODE_H)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_PHOTO_MODE, SDL_SCANCODE_F1)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_UNBIND_KEY,        SDL_SCANCODE_BACKSPACE)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_RESET_BINDINGS,    SDL_SCANCODE_R)
 

diff --git a/src/libtrx/include/libtrx/game/input/backends/keyboard_tr2.def b/src/libtrx/include/libtrx/game/input/backends/keyboard_tr2.def
@@ -14,6 +14,9 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ROLL,                        SDL_SCANCODE_END)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ENTER_CONSOLE,               SDL_SCANCODE_SLASH)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SAVE,                        SDL_SCANCODE_F5)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_LOAD,                        SDL_SCANCODE_F6)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_PAUSE,                       SDL_SCANCODE_P)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_UI,                   SDL_SCANCODE_H)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_PHOTO_MODE,           SDL_SCANCODE_F1)
 
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_FLY_CHEAT,                   SDL_SCANCODE_O)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_ITEM_CHEAT,                  SDL_SCANCODE_I)
@@ -38,17 +41,14 @@ INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_SMALL_MEDI,              SDL_SCANCODE_8)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_BIG_MEDI,                SDL_SCANCODE_9)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_USE_FLARE,                   SDL_SCANCODE_COMMA)
 
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_PAUSE,                       SDL_SCANCODE_P)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_RESOLUTION,           SDL_SCANCODE_F1)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_INTERNAL_SCREEN_SIZE, SDL_SCANCODE_F2)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_FULLSCREEN,           SDL_SCANCODE_UNKNOWN)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_BILINEAR_FILTER,      SDL_SCANCODE_F3)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_PERSPECTIVE_FILTER,   SDL_SCANCODE_F4)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_Z_BUFFER,             SDL_SCANCODE_F7)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_CYCLE_LIGHTING_CONTRAST,     SDL_SCANCODE_F8)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_FULLSCREEN,           SDL_SCANCODE_UNKNOWN)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_INTERNAL_SCREEN_SIZE, SDL_SCANCODE_F10)
+INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_SWITCH_RESOLUTION,           SDL_SCANCODE_F11)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_RENDERING_MODE,       SDL_SCANCODE_F12)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_UI,                   SDL_SCANCODE_H)
-INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_TOGGLE_PHOTO_MODE,           SDL_SCANCODE_F11)
 
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_OPTION,                      SDL_SCANCODE_ESCAPE)
 INPUT_KEYBOARD_ASSIGN(INPUT_ROLE_MENU_BACK,                   SDL_SCANCODE_ESCAPE)