Merge branch 'accurate' into portable
This commit is contained in:
commit
b00e65b90b
2 changed files with 1 additions and 4 deletions
|
@ -462,7 +462,7 @@ int Scene_DownIsland(int mode)
|
||||||
GetTrg();
|
GetTrg();
|
||||||
|
|
||||||
// Escape menu
|
// Escape menu
|
||||||
if (gKey & 0x8000)
|
if (gKey & KEY_ESCAPE)
|
||||||
{
|
{
|
||||||
switch (Call_Escape())
|
switch (Call_Escape())
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
#include "WindowsWrapper.h"
|
#include "WindowsWrapper.h"
|
||||||
|
|
||||||
extern BOOL gbUseJoystick;
|
|
||||||
extern int gJoystickButtonTable[8];
|
|
||||||
|
|
||||||
struct JOYSTICK_STATUS
|
struct JOYSTICK_STATUS
|
||||||
{
|
{
|
||||||
BOOL bLeft;
|
BOOL bLeft;
|
||||||
|
|
Loading…
Add table
Reference in a new issue