From daee581e7f68ceea45476b9b1310473ec154741e Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sat, 6 Jul 2019 14:45:42 +0300
Subject: [PATCH] 3DS revert CAM_OFFSET_FOLLOW changes, use Nintendo keys
 layout for save game screen

---
 src/camera.h    | 3 ++-
 src/inventory.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/camera.h b/src/camera.h
index 847583a..4c39c12 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -6,7 +6,6 @@
 #include "controller.h"
 #include "character.h"
 
-#define CAM_OFFSET_FOLLOW (1024.0f + 512.0f)
 #define CAM_OFFSET_COMBAT (2048.0f + 512.0f)
 #define CAM_OFFSET_LOOK   (512.0f)
 
@@ -16,8 +15,10 @@
 #define CAM_EYE_SEPARATION   16.0f
 #ifdef _OS_3DS
     #define CAM_FOCAL_LENGTH     512.0f
+    #define CAM_OFFSET_FOLLOW    (1024.0f + 512.0f + 256.0f)
 #else
     #define CAM_FOCAL_LENGTH     1536.0f
+    #define CAM_OFFSET_FOLLOW    (1024.0f + 512.0f)
 #endif
 
 #define CAM_FOLLOW_ANGLE     0.0f
diff --git a/src/inventory.h b/src/inventory.h
index 18288da..53a362d 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -1213,7 +1213,7 @@ struct Inventory {
             if (Input::lastState[playerIndex] == cLeft || Input::lastState[playerIndex] == cRight)
                 slot ^= 1;
 
-            if (Input::lastState[playerIndex] == cAction) {
+            if (key == cAction) {
                 if (slot == 1) {
                     if (index > -1) {
                         TR::Entity &e = game->getLevel()->entities[index];