From 957e2b96e7eb92f345d526ddac78a28c28e4375a Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sat, 2 Apr 2016 19:55:42 +0900
Subject: [PATCH] Disable joystick

---
 src/sys/nact.cpp       | 2 ++
 src/sys/nact.h         | 6 ++----
 src/sys/nact_input.cpp | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index e74372f..a5b46e2 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -120,11 +120,13 @@ NACT::NACT()
 	ags = new AGS(this);
 	mako = new MAKO(this);
 
+#ifdef USE_JOY
 	// 入力初期化
 	joy_num = joyGetNumDevs();
 	if(joy_num) {
 		joyGetDevCaps(JOYSTICKID1, &joycaps, sizeof(JOYCAPS));
 	}
+#endif
 
 	terminate = false;
 }
diff --git a/src/sys/nact.h b/src/sys/nact.h
index cc6aeec..b123f9b 100644
--- a/src/sys/nact.h
+++ b/src/sys/nact.h
@@ -8,10 +8,6 @@
 #define _NACT_H_
 
 #include <windows.h>
-#if defined(_DEBUG_CONSOLE)
-#include <wincon.h>
-#endif
-#include <mmsystem.h>
 #include <stdio.h>
 #include "../common.h"
 
@@ -213,8 +209,10 @@ private:
 	void get_cursor(int* x, int* y);
 	void set_cursor(int x, int y);
 
+#ifdef USE_JOY
 	int joy_num;
 	JOYCAPS joycaps;
+#endif
 	int mouse_x, mouse_y;
 
 	uint32 calc_crc32();
diff --git a/src/sys/nact_input.cpp b/src/sys/nact_input.cpp
index 9ff578b..b48bf66 100644
--- a/src/sys/nact_input.cpp
+++ b/src/sys/nact_input.cpp
@@ -38,6 +38,7 @@ uint8 NACT::get_key()
 
 	// マウス移動で方向入力はサポートしない
 
+#ifdef USE_JOY
 	// ジョイスティック
 	if(joy_num > 0) {
 		JOYINFO joyinfo;
@@ -52,6 +53,7 @@ uint8 NACT::get_key()
 			if(joyinfo.wButtons & JOY_BUTTON4) val |= 0x80;
 		}
 	}
+#endif
 
 	return val;
 }