From 6052a09074ee7a9bc2f3e00db4d2ba04c333124d Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 4 Jan 2020 00:52:57 +0000 Subject: [PATCH 1/2] Apply missing KEY_ESCAPE constant --- src/Ending.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ending.cpp b/src/Ending.cpp index e659ca89..40553768 100644 --- a/src/Ending.cpp +++ b/src/Ending.cpp @@ -462,7 +462,7 @@ int Scene_DownIsland(HWND hWnd, int mode) GetTrg(); // Escape menu - if (gKey & 0x8000) + if (gKey & KEY_ESCAPE) { switch (Call_Escape(hWnd)) { From b35fa162e04720d96457a35ea91ca0a557ef496a Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sat, 4 Jan 2020 01:01:11 +0000 Subject: [PATCH 2/2] Remove a pair of variable declarations Besides, these are defined in Main.cpp, not KeyControl.cpp. Anyway, according to the Linux debug data, these two were never declared outside of Main.cpp, showing they were never declared in a header file. --- src/Input.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Input.h b/src/Input.h index 1f838ea5..feaf9178 100644 --- a/src/Input.h +++ b/src/Input.h @@ -2,9 +2,6 @@ #include "WindowsWrapper.h" -extern BOOL gbUseJoystick; -extern int gJoystickButtonTable[8]; - struct JOYSTICK_STATUS { BOOL bLeft;