piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sync info about pressed wiimote button

Browse Source
This commit is contained in:
mimimi085181
2017-07-15 00:33:23 +02:00
parent 8b1e61b00a
commit acde0b8b6c
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/HW/Wiimote.cpp
View File

@ -16,13 +16,14 @@
#include "Core/IOS/USB/Bluetooth/BTEmu.h"
#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
#include "Core/Movie.h"
#include "Core/NetPlayClient.h"
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/InputConfig.h"
// Limit the amount of wiimote connect requests, when a button is pressed in disconnected state
std::array<u8, 4> last_connect_request_counter;
static std::array<u8, 4> s_last_connect_request_counter;
namespace Wiimote
{
@ -118,7 +119,7 @@ void ResetAllWiimotes()
void LoadConfig()
{
s_config.LoadConfig(false);
last_connect_request_counter.fill(0);
s_last_connect_request_counter.fill(0);
}
void Resume()
@ -149,9 +150,11 @@ void InterruptChannel(int number, u16 channel_id, const void* data, u32 size)
bool ButtonPressed(int number)
{
if (last_connect_request_counter[number] > 0)
if (s_last_connect_request_counter[number] > 0)
{
--last_connect_request_counter[number];
--s_last_connect_request_counter[number];
if (g_wiimote_sources[number] && NetPlay::IsNetPlayRunning())
Wiimote::NetPlay_GetButtonPress(number, false);
return false;
}
@ -164,6 +167,9 @@ bool ButtonPressed(int number)
if (WIIMOTE_SRC_REAL & g_wiimote_sources[number])
button_pressed = WiimoteReal::CheckForButtonPress(number);
if (g_wiimote_sources[number] && NetPlay::IsNetPlayRunning())
button_pressed = Wiimote::NetPlay_GetButtonPress(number, button_pressed);
return button_pressed;
}
@ -184,7 +190,7 @@ void Update(int number, bool connected)
Connect(number, true);
// arbitrary value so it doesn't try to send multiple requests before Dolphin can react
// if Wii Remotes are polled at 200Hz then this results in one request being sent per 500ms
last_connect_request_counter[number] = 100;
s_last_connect_request_counter[number] = 100;
}
}
}