From 8f52b71abcc42fbcb2947b0261648afff7fbf65b Mon Sep 17 00:00:00 2001 From: dborth Date: Wed, 28 Oct 2009 00:11:43 +0000 Subject: [PATCH] pad mapping fix --- source/ngc/fceugx.cpp | 8 +------- source/ngc/pad.cpp | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/source/ngc/fceugx.cpp b/source/ngc/fceugx.cpp index ba0b878..0b17710 100644 --- a/source/ngc/fceugx.cpp +++ b/source/ngc/fceugx.cpp @@ -282,15 +282,9 @@ int main(int argc, char *argv[]) #endif MountAllFAT(); // Initialize libFAT for SD and USB - DefaultSettings(); // Set defaults - - // Audio InitialiseAudio(); - - // Initialize font system - InitFreeType((u8*)font_ttf, font_ttf_size); - + InitFreeType((u8*)font_ttf, font_ttf_size); // Initialize font system InitGUIThreads(); // allocate memory to store rom diff --git a/source/ngc/pad.cpp b/source/ngc/pad.cpp index 1195782..a74f558 100644 --- a/source/ngc/pad.cpp +++ b/source/ngc/pad.cpp @@ -357,9 +357,9 @@ static unsigned char DecodeJoy(unsigned short chan) unsigned char J = 0; #ifdef HW_RVL - s8 wm_ax = userInput[0].WPAD_StickX(0); - s8 wm_ay = userInput[0].WPAD_StickY(0); - u32 wp = userInput[0].wpad->btns_h; + s8 wm_ax = userInput[chan].WPAD_StickX(0); + s8 wm_ay = userInput[chan].WPAD_StickY(0); + u32 wp = userInput[chan].wpad->btns_h; u32 exp_type; if ( WPAD_Probe(chan, &exp_type) != 0 ) exp_type = WPAD_EXP_NONE;