ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

onepad: init all fields of objects

This commit is contained in:
Gregory Hainaut 2017-01-22 16:34:27 +01:00
parent 5d119bec31
commit 9120c3bfb1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/onepad/Linux/JoystickConfiguration.cpp
View File

@ -33,6 +33,12 @@ JoystickConfiguration::JoystickConfiguration(int pad, bool left, wxWindow *paren
wxCLOSE_BOX |
wxCLIP_CHILDREN)
{
m_init_reverse_Lx = false;
m_init_reverse_Ly = false;
m_init_reverse_Rx = false;
m_init_reverse_Ry = false;
m_init_mouse_Ljoy = false;
m_init_mouse_Rjoy = false;
m_pad_id = pad;
m_isForLeftJoystick = left;
@ -64,6 +70,10 @@ JoystickConfiguration::JoystickConfiguration(int pad, bool left, wxWindow *paren
_T("Use mouse for left analog joystick"), // Label
wxPoint(20, 60) // Position
);
m_cb_reverse_Rx = nullptr;
m_cb_reverse_Ry = nullptr;
m_cb_mouse_Rjoy = nullptr;
} else {
m_cb_reverse_Rx = new wxCheckBox(
m_pan_joystick_config, // Parent
@ -85,6 +95,10 @@ JoystickConfiguration::JoystickConfiguration(int pad, bool left, wxWindow *paren
_T("Use mouse for right analog joystick"), // Label
wxPoint(20, 60) // Position
);
m_cb_reverse_Lx = nullptr;
m_cb_reverse_Ly = nullptr;
m_cb_mouse_Ljoy = nullptr;
}
m_bt_ok = new wxButton(

6
plugins/onepad/SDL/joystick.h
View File

@ -36,11 +36,13 @@ class JoystickInfo : GamePad
public:
JoystickInfo()
: GamePad()
, joy(NULL)
, joy(nullptr)
{
#if SDL_MAJOR_VERSION >= 2
haptic = NULL;
haptic = nullptr;
first = true;
memset(effects, 0, sizeof(effects));
memset(effects_id, 0, sizeof(effects_id));
#endif
}