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

Some small fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1781 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-01-05 00:10:19 +00:00
parent 442f47df4c
commit 7d08aed4c1
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/SConscript
View File

@ -45,10 +45,9 @@ files = ["Console.cpp",
"HW/MemoryInterface.cpp", "HW/MemoryInterface.cpp",
"HW/PeripheralInterface.cpp", "HW/PeripheralInterface.cpp",
"HW/PixelEngine.cpp", "HW/PixelEngine.cpp",
"HW/SerialInterface.cpp",
"HW/SI.cpp", "HW/SI.cpp",
"HW/SI_Device.cpp", "HW/SI_Device.cpp",
"HW/SI_DeviceGBA.cpp", # "HW/SI_DeviceGBA.cpp",
"HW/SI_DeviceGCController.cpp", "HW/SI_DeviceGCController.cpp",
"HW/StreamADPCM.cpp", "HW/StreamADPCM.cpp",
"HW/SystemTimers.cpp", "HW/SystemTimers.cpp",

9
Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.cpp
View File

@ -94,7 +94,12 @@ bool registerKey(int nPad, int id, sf::Key::Code code, int mods) {
key.keyCode = code; key.keyCode = code;
key.mods = mods; key.mods = mods;
if (!eventHandler->EventHandler::RegisterEventListener(ParseKeyEvent, key)) { if (!eventHandler) {
PanicAlert("Can't get event handler");
return false;
}
if (!eventHandler->RegisterEventListener(ParseKeyEvent, key)) {
char codestr[100]; char codestr[100];
EventHandler::SFKeyToString(code, codestr); EventHandler::SFKeyToString(code, codestr);
PanicAlert("Failed to register %s, might be already in use", codestr); PanicAlert("Failed to register %s, might be already in use", codestr);
@ -109,7 +114,7 @@ bool registerKey(int nPad, int id, sf::Key::Code code, int mods) {
oldKey.mods = mods; oldKey.mods = mods;
// Might be not be registered yet // Might be not be registered yet
eventHandler->EventHandler::RemoveEventListener(oldKey); eventHandler->RemoveEventListener(oldKey);
} }
pad[nPad].keyForControl[id] = code; pad[nPad].keyForControl[id] = code;