Fixed wiimote HOME bug and removed yohanes SDL

This commit is contained in:
simon.kagstrom 2009-01-16 19:24:55 +00:00
parent 47cfca1a0c
commit dd756b9df9
3 changed files with 9 additions and 2 deletions

View File

@ -35,7 +35,7 @@ LDFLAGS = -L$(DEVKITPRO)/SDL/lib -g $(MACHDEP) -Wl,-Map,$(notdir $@).map
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# any extra libraries we wish to link with the project # any extra libraries we wish to link with the project
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
LIBS := -lSDL_image -lSDL_ttf -ljpeg -lpng -lz -lSDL_yohanes -lfreetype -lfat -lwiiuse -lbte -logc -lm LIBS := -lSDL_image -lSDL_ttf -ljpeg -lpng -lz -lSDL -lfreetype -lfat -lwiiuse -lbte -logc -lm
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# list of directories containing libraries, this must be the top level containing # list of directories containing libraries, this must be the top level containing

View File

@ -605,6 +605,9 @@ uint8 C64::poll_joystick(int port)
wpad = WPAD_Data(controller); wpad = WPAD_Data(controller);
wpad_other = WPAD_Data(!controller); wpad_other = WPAD_Data(!controller);
if (!wpad && !wpad_other)
return 0xff;
held = wpad->btns_h; held = wpad->btns_h;
held_other = wpad_other->btns_h; held_other = wpad_other->btns_h;

View File

@ -272,6 +272,10 @@ static uint32_t wait_key_press(void)
wpad = WPAD_Data(WPAD_CHAN_0); wpad = WPAD_Data(WPAD_CHAN_0);
wpad_other = WPAD_Data(WPAD_CHAN_1); wpad_other = WPAD_Data(WPAD_CHAN_1);
if (!wpad && !wpad_other)
return 0;
remote_keys = wpad->btns_d | wpad_other->btns_d; remote_keys = wpad->btns_d | wpad_other->btns_d;
classic_keys = 0; classic_keys = 0;
@ -357,7 +361,7 @@ static uint32_t wait_key_press(void)
} }
if (keys != 0) if (keys != 0)
return keys; return keys;
SDL_Delay(30); SDL_Delay(100);
} }
return keys; return keys;