ref: b00e65b90beebc47b463582f48b52431f8bf5bb6
parent: deadc396bc37db36b5c9312d9fce08b90f6f80ad
parent: b35fa162e04720d96457a35ea91ca0a557ef496a
author: Clownacy <Clownacy@users.noreply.github.com>
date: Fri Jan 3 20:09:49 EST 2020
Merge branch 'accurate' into portable
--- a/src/Ending.cpp
+++ b/src/Ending.cpp
@@ -462,7 +462,7 @@
GetTrg();
// Escape menu
- if (gKey & 0x8000)
+ if (gKey & KEY_ESCAPE)
{
switch (Call_Escape())
{
--- 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;
--
⑨