diff options
author | Shachar Liberman <lshachar@hotmail.com> | 2006-08-12 13:43:20 +0000 |
---|---|---|
committer | Shachar Liberman <lshachar@hotmail.com> | 2006-08-12 13:43:20 +0000 |
commit | 0ed49044b06027b3542bc00ed63d9e8b8ec9cd53 (patch) | |
tree | 7ec2ca21115e5776cefabe7abfe9f8d20d60abbf | |
parent | f53779d2f41fc2bcfff5196a279e2192992880e2 (diff) | |
download | rockbox-0ed49044b06027b3542bc00ed63d9e8b8ec9cd53.tar.gz rockbox-0ed49044b06027b3542bc00ed63d9e8b8ec9cd53.zip |
Fixing Sudoku menu to work properly with FS#5182
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10546 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index 6efd7ffbfd..74863cdedd 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -968,38 +968,15 @@ bool sudoku_generate(struct sudoku_state_t* state) | |||
968 | rb->memcpy(state,&new_state,sizeof(new_state)); | 968 | rb->memcpy(state,&new_state,sizeof(new_state)); |
969 | rb->snprintf(str,sizeof(str),"Difficulty: %s",difficulty); | 969 | rb->snprintf(str,sizeof(str),"Difficulty: %s",difficulty); |
970 | display_board(state); | 970 | display_board(state); |
971 | rb->splash(3*HZ, true, str); | 971 | rb->splash(HZ*3, true, str); |
972 | rb->strncpy(state->filename,GAME_FILE,MAX_PATH); | 972 | rb->strncpy(state->filename,GAME_FILE,MAX_PATH); |
973 | } else { | 973 | } else { |
974 | display_board(&new_state); | 974 | display_board(&new_state); |
975 | rb->splash(2*HZ, true, "Aborted"); | 975 | rb->splash(HZ*2, true, "Aborted"); |
976 | } | 976 | } |
977 | return res; | 977 | return res; |
978 | } | 978 | } |
979 | 979 | ||
980 | int sudoku_menu_cb(int key, int m) | ||
981 | { | ||
982 | (void)m; | ||
983 | switch(key) | ||
984 | { | ||
985 | #ifdef MENU_ENTER2 | ||
986 | case MENU_ENTER2: | ||
987 | #endif | ||
988 | case MENU_ENTER: | ||
989 | key = BUTTON_NONE; /* eat the downpress, next menu reacts on release */ | ||
990 | break; | ||
991 | |||
992 | #ifdef MENU_ENTER2 | ||
993 | case MENU_ENTER2 | BUTTON_REL: | ||
994 | #endif | ||
995 | case MENU_ENTER | BUTTON_REL: | ||
996 | key = MENU_ENTER; /* fake downpress, next menu doesn't like release */ | ||
997 | break; | ||
998 | } | ||
999 | |||
1000 | return key; | ||
1001 | } | ||
1002 | |||
1003 | bool sudoku_menu(struct sudoku_state_t* state) | 980 | bool sudoku_menu(struct sudoku_state_t* state) |
1004 | { | 981 | { |
1005 | int m; | 982 | int m; |
@@ -1017,7 +994,7 @@ bool sudoku_menu(struct sudoku_state_t* state) | |||
1017 | }; | 994 | }; |
1018 | 995 | ||
1019 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 996 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
1020 | sudoku_menu_cb, NULL, NULL, NULL); | 997 | NULL, NULL, NULL, NULL); |
1021 | 998 | ||
1022 | result=rb->menu_show(m); | 999 | result=rb->menu_show(m); |
1023 | 1000 | ||
@@ -1078,7 +1055,7 @@ int sudoku_edit_menu(struct sudoku_state_t* state) | |||
1078 | }; | 1055 | }; |
1079 | 1056 | ||
1080 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 1057 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
1081 | sudoku_menu_cb, NULL, NULL, NULL); | 1058 | NULL, NULL, NULL, NULL); |
1082 | 1059 | ||
1083 | result=rb->menu_show(m); | 1060 | result=rb->menu_show(m); |
1084 | 1061 | ||