more includes updates, disable right menu stick left press on CC for back to home

This commit is contained in:
dborth 2009-01-08 07:37:32 +00:00
parent 96c0a729bd
commit 110cc7fc39
3 changed files with 16 additions and 18 deletions

View File

@ -308,7 +308,6 @@ u32 GetJoy(int pad)
s8 gc_py = PAD_SubStickY (0); s8 gc_py = PAD_SubStickY (0);
#ifdef HW_RVL #ifdef HW_RVL
s8 wm_sx = WPAD_Stick (0,1,0);
s8 wm_sy = WPAD_Stick (0,1,1); s8 wm_sy = WPAD_Stick (0,1,1);
u32 wm_pb = WPAD_ButtonsHeld (0); // wiimote / expansion button info u32 wm_pb = WPAD_ButtonsHeld (0); // wiimote / expansion button info
#endif #endif
@ -329,7 +328,6 @@ u32 GetJoy(int pad)
#ifdef HW_RVL #ifdef HW_RVL
|| (wm_pb & WPAD_BUTTON_HOME) || (wm_pb & WPAD_BUTTON_HOME)
|| (wm_pb & WPAD_CLASSIC_BUTTON_HOME) || (wm_pb & WPAD_CLASSIC_BUTTON_HOME)
|| (wm_sx < -70)
#endif #endif
) )
{ {

View File

@ -15,18 +15,18 @@
#include "unzip.h" #include "unzip.h"
#include "Util.h" #include "Util.h"
#include "Flash.h" #include "common/Port.h"
#include "Patch.h" #include "gba/Flash.h"
#include "Port.h" #include "common/Patch.h"
#include "RTC.h" #include "gba/RTC.h"
#include "Sound.h" #include "gba/Sound.h"
#include "Cheats.h" #include "gba/Cheats.h"
#include "agb/GBA.h" #include "gba/GBA.h"
#include "agb/agbprint.h" #include "gba/agbprint.h"
#include "dmg/gb.h" #include "gb/gb.h"
#include "dmg/gbGlobals.h" #include "gb/gbGlobals.h"
#include "dmg/gbCheats.h" #include "gb/gbCheats.h"
#include "dmg/gbSound.h" #include "gb/gbSound.h"
#include "vba.h" #include "vba.h"
#include "fileop.h" #include "fileop.h"

View File

@ -15,10 +15,10 @@
#include <fat.h> #include <fat.h>
#include <sys/dir.h> #include <sys/dir.h>
#include "agb/GBA.h" #include "gba/GBA.h"
#include "Globals.h" #include "gba/Globals.h"
#include "Util.h" #include "Util.h"
#include "Port.h" #include "common/Port.h"
#include "vba.h" #include "vba.h"
#include "fileop.h" #include "fileop.h"