1 files changed, 8 insertions, 34 deletions

diff --git a/src/ControllerConfig.h b/src/ControllerConfig.h
index a439e09b..b7fd181d 100644
--- a/src/ControllerConfig.h
+++ b/src/ControllerConfig.h
@@ -1,39 +1,5 @@
 #pragma once
 
-// dinput.h
-typedef struct DIJOYSTATE2 {
-    LONG    lX;                     /* x-axis position              */
-    LONG    lY;                     /* y-axis position              */
-    LONG    lZ;                     /* z-axis position              */
-    LONG    lRx;                    /* x-axis rotation              */
-    LONG    lRy;                    /* y-axis rotation              */
-    LONG    lRz;                    /* z-axis rotation              */
-    LONG    rglSlider[2];           /* extra axes positions         */
-    DWORD   rgdwPOV[4];             /* POV directions               */
-    BYTE    rgbButtons[128];        /* 128 buttons                  */
-    LONG    lVX;                    /* x-axis velocity              */
-    LONG    lVY;                    /* y-axis velocity              */
-    LONG    lVZ;                    /* z-axis velocity              */
-    LONG    lVRx;                   /* x-axis angular velocity      */
-    LONG    lVRy;                   /* y-axis angular velocity      */
-    LONG    lVRz;                   /* z-axis angular velocity      */
-    LONG    rglVSlider[2];          /* extra axes velocities        */
-    LONG    lAX;                    /* x-axis acceleration          */
-    LONG    lAY;                    /* y-axis acceleration          */
-    LONG    lAZ;                    /* z-axis acceleration          */
-    LONG    lARx;                   /* x-axis angular acceleration  */
-    LONG    lARy;                   /* y-axis angular acceleration  */
-    LONG    lARz;                   /* z-axis angular acceleration  */
-    LONG    rglASlider[2];          /* extra axes accelerations     */
-    LONG    lFX;                    /* x-axis force                 */
-    LONG    lFY;                    /* y-axis force                 */
-    LONG    lFZ;                    /* z-axis force                 */
-    LONG    lFRx;                   /* x-axis torque                */
-    LONG    lFRy;                   /* y-axis torque                */
-    LONG    lFRz;                   /* z-axis torque                */
-    LONG    rglFSlider[2];          /* extra axes forces            */
-} DIJOYSTATE2, *LPDIJOYSTATE2;
-
 
 // based on x-gtasa
 
@@ -45,6 +11,8 @@ enum eControllerType
 	JOYSTICK,
 };
 
+class CMouseControllerState;
+
 class CControllerConfigManager
 {
 public:
@@ -72,6 +40,12 @@ public:
 	void UpdateJoyInConfigMenus_ButtonUp(int button, int padnumber);
 	void AffectControllerStateOn_ButtonUp(int button, int padnumber);
 	
+	Int32 GetJoyButtonJustDown();
+	void LoadSettings(Int32 file);
+	void MakeControllerActionsBlank();
+	void InitDefaultControlConfiguration();
+	void InitDefaultControlConfigMouse(CMouseControllerState const &mousestate);
+	
 };
 
 VALIDATE_SIZE(CControllerConfigManager, 0x143C);