1.40a fixes

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@402 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-03-29 12:06:20 +00:00
parent 58d18b39d9
commit 558d8e1fdd
6 changed files with 18 additions and 6 deletions

View file

@ -232,7 +232,7 @@ $(error need VER)
endif
endif
rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png game.cfg
rel: PicoDrive.gpe code940/pico940_v2.bin readme.txt PicoDrive.man.txt PicoDrive.png game_def.cfg
zip -9 -j ../../PicoDrive_$(VER).zip $^ mmuhack.o
zip -9 -r ../../PicoDrive_$(VER).zip skin -i \*.png -i \*.txt

View file

@ -124,6 +124,8 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
// handle only 1 event at a time
for (i = 1; i != 0; i <<= 1)
if (ret & i) { ret &= i; break; }
// ... but allow select
ret |= inp_prev & GP2X_SELECT;
return ret;
}
@ -780,7 +782,8 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
draw_key_config(opts, opt_cnt, player_idx, sel);
inp = wait_for_input_usbjoy(CONFIGURABLE_KEYS, &joy);
// printf("got %08lX from joy %i\n", inp, joy);
if (joy == 0) {
if (joy == 0)
{
if (!(inp & GP2X_SELECT)) {
prev_select = 0;
if(inp & GP2X_UP ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }

View file

@ -1,2 +1,2 @@
#define VERSION "1.40"
#define VERSION "1.40a"