Rename pluginspecs_pad.h to GCPadStatus.h, and move it into InputCommon.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5671 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@@ -848,12 +848,14 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
State_UndoSaveState();
|
||||
else if (event.GetModifiers() == wxMOD_SHIFT)
|
||||
State_UndoLoadState();
|
||||
else event.Skip();
|
||||
else
|
||||
event.Skip();
|
||||
}
|
||||
// screenshot hotkeys
|
||||
else if (event.GetKeyCode() == WXK_F9 && event.GetModifiers() == wxMOD_NONE)
|
||||
Core::ScreenShot();
|
||||
else event.Skip();
|
||||
else
|
||||
event.Skip();
|
||||
|
||||
// Actually perform the wiimote connection or disconnection
|
||||
if (WiimoteId >= 0)
|
||||
@@ -883,7 +885,6 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
|
||||
#endif
|
||||
|
||||
// Send the keyboard status to the Input plugins
|
||||
PAD_Input(event.GetKeyCode(), 1); // 1 = Down
|
||||
CPluginManager::GetInstance().GetWiimote()->Wiimote_Input(event.GetKeyCode(), 1); // 1 = Down
|
||||
}
|
||||
else
|
||||
@@ -895,7 +896,6 @@ void CFrame::OnKeyUp(wxKeyEvent& event)
|
||||
event.Skip();
|
||||
|
||||
if(Core::GetState() != Core::CORE_UNINITIALIZED) {
|
||||
PAD_Input(event.GetKeyCode(), 0); // 0 = Up
|
||||
CPluginManager::GetInstance().GetWiimote()->Wiimote_Input(event.GetKeyCode(), 0); // 0 = Up
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#define _WINSOCK2API_
|
||||
#include <SFML/Network.hpp>
|
||||
|
||||
#include "pluginspecs_pad.h"
|
||||
#include "GCPadStatus.h"
|
||||
#include "svnrev.h"
|
||||
|
||||
//#include <wx/wx.h>
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
//#include "Common.h"
|
||||
//#include "NetStructs.h"
|
||||
//#include "Core.h"
|
||||
//#include "pluginspecs_pad.h"
|
||||
//#include "HW/SI.h"
|
||||
//#include "HW/SI_Device.h"
|
||||
//#include "HW/SI_DeviceGCController.h"
|
||||
|
||||
Reference in New Issue
Block a user