diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-05 15:51:57 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-02-05 16:23:50 +0100 |
| commit | c7ba01b034ab67b1343bc728bd058c47eb48efc4 (patch) | |
| tree | 130781cee8e0b7f8f00162dfb2e895211d4e097f /src/skel/glfw | |
| parent | MP3 player fixes (diff) | |
| download | re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar.gz re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar.bz2 re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar.lz re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar.xz re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.tar.zst re3-c7ba01b034ab67b1343bc728bd058c47eb48efc4.zip | |
Diffstat (limited to 'src/skel/glfw')
| -rw-r--r-- | src/skel/glfw/glfw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp index 9643c63b..b413a1ce 100644 --- a/src/skel/glfw/glfw.cpp +++ b/src/skel/glfw/glfw.cpp @@ -81,7 +81,7 @@ static psGlobalType PsGlobal; size_t _dwMemAvailPhys; RwUInt32 gGameState; -#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS +#ifdef DETECT_JOYSTICK_MENU char gSelectedJoystickName[128] = ""; #endif @@ -841,7 +841,7 @@ void joysChangeCB(int jid, int event); bool IsThisJoystickBlacklisted(int i) { -#ifndef DONT_TRUST_RECOGNIZED_JOYSTICKS +#ifndef DETECT_JOYSTICK_MENU return false; #else if (glfwJoystickIsGamepad(i)) @@ -906,7 +906,7 @@ void _InputInitialiseJoys() if (PSGLOBAL(joy1id) != -1) { int count; glfwGetJoystickButtons(PSGLOBAL(joy1id), &count); -#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS +#ifdef DETECT_JOYSTICK_MENU strcpy(gSelectedJoystickName, glfwGetJoystickName(PSGLOBAL(joy1id))); #endif ControlsManager.InitDefaultControlConfigJoyPad(count); @@ -2150,7 +2150,7 @@ void joysChangeCB(int jid, int event) if (event == GLFW_CONNECTED && !IsThisJoystickBlacklisted(jid)) { if (PSGLOBAL(joy1id) == -1) { PSGLOBAL(joy1id) = jid; -#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS +#ifdef DETECT_JOYSTICK_MENU strcpy(gSelectedJoystickName, glfwGetJoystickName(jid)); #endif // This is behind LOAD_INI_SETTINGS, because otherwise the Init call below will destroy/overwrite your bindings. |