summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-10-25 00:05:07 +0200
committererorcun <erorcunerorcun@hotmail.com.tr>2020-10-25 00:10:03 +0200
commit5e5854b914d3b72855f872575adb13f7decca8b8 (patch)
tree5906a9b373c35b92154db84ed943d4ea107d7b57 /src/core
parentlibrw update (diff)
downloadre3-5e5854b914d3b72855f872575adb13f7decca8b8.tar
re3-5e5854b914d3b72855f872575adb13f7decca8b8.tar.gz
re3-5e5854b914d3b72855f872575adb13f7decca8b8.tar.bz2
re3-5e5854b914d3b72855f872575adb13f7decca8b8.tar.lz
re3-5e5854b914d3b72855f872575adb13f7decca8b8.tar.xz
re3-5e5854b914d3b72855f872575adb13f7decca8b8.tar.zst
re3-5e5854b914d3b72855f872575adb13f7decca8b8.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/re3.cpp32
1 files changed, 30 insertions, 2 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 069320ec..98201d5a 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -32,6 +32,8 @@
#include "MBlur.h"
#include "postfx.h"
#include "custompipes.h"
+#include "FileMgr.h"
+#include "ControllerConfig.h"
#ifndef _WIN32
#include "assert.h"
@@ -275,7 +277,7 @@ wchar* DetectJoystickDraw(bool* disabled, bool userHovering) {
const char *joyname;
if (userHovering) {
for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
- if (joyname = glfwGetJoystickName(i)) {
+ if ((joyname = glfwGetJoystickName(i))) {
const uint8* buttons = glfwGetJoystickButtons(i, &numButtons);
for (int j = 0; j < numButtons; j++) {
if (buttons[j]) {
@@ -455,8 +457,34 @@ void LoadINISettings()
char defaultStr[4];
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+ // Written by assuming the codes below will run after _InputInitialiseJoys().
strcpy(gSelectedJoystickName, cfg.get("DetectJoystick", "JoystickName", "").c_str());
- _InputInitialiseJoys();
+
+ if(gSelectedJoystickName[0] != '\0') {
+ for (int i = 0; i <= GLFW_JOYSTICK_LAST; i++) {
+ if (glfwJoystickPresent(i) && strncmp(gSelectedJoystickName, glfwGetJoystickName(i), strlen(gSelectedJoystickName)) == 0) {
+ if (PSGLOBAL(joy1id) != -1) {
+ PSGLOBAL(joy2id) = PSGLOBAL(joy1id);
+ }
+ PSGLOBAL(joy1id) = i;
+ int count;
+ glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
+
+ // We need to init and reload bindings, because;
+ // 1-joypad button number may differ with saved/prvly connected one
+ // 2-bindings are not init'ed if there is no joypad at the start
+ ControlsManager.InitDefaultControlConfigJoyPad(count);
+ CFileMgr::SetDirMyDocuments();
+ int32 gta3set = CFileMgr::OpenFile("gta3.set", "r");
+ if (gta3set) {
+ ControlsManager.LoadSettings(gta3set);
+ CFileMgr::CloseFile(gta3set);
+ }
+ CFileMgr::SetDir("");
+ break;
+ }
+ }
+ }
#endif
#ifdef CUSTOM_FRONTEND_OPTIONS