mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Made it easer to use mouse/keyboard and a gamepad together on the same emulated wiimote. Renamed mouse buttons from "Button N" to "Click N" so they do not conflict with gamepad buttons.(hopefully not too ugly, mouse buttons will need to be reconfigured) (Fixes issue 3363)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6289 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -863,10 +863,8 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
|
||||
// TODO: finish this
|
||||
|
||||
// Buttons
|
||||
// these alright for OSX/Linux?
|
||||
|
||||
set_control(m_buttons, 0, "Button 0"); // A
|
||||
set_control(m_buttons, 1, "Button 1"); // B
|
||||
set_control(m_buttons, 0, "Click 0"); // A
|
||||
set_control(m_buttons, 1, "Click 1"); // B
|
||||
//set_control(m_buttons, 2, ""); // 1
|
||||
//set_control(m_buttons, 3, ""); // 2
|
||||
//set_control(m_buttons, 4, ""); // -
|
||||
@ -875,7 +873,7 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
|
||||
|
||||
// Shake
|
||||
for (unsigned int i=0; i<3; ++i)
|
||||
set_control(m_shake, i, "Button 2");
|
||||
set_control(m_shake, i, "Click 2");
|
||||
|
||||
// IR
|
||||
#ifndef __APPLE__
|
||||
|
Reference in New Issue
Block a user