summaryrefslogtreecommitdiffstats
path: root/apps/plugins/sudoku
diff options
context:
space:
mode:
authorShachar Liberman <lshachar@hotmail.com>2006-08-12 13:43:20 +0000
committerShachar Liberman <lshachar@hotmail.com>2006-08-12 13:43:20 +0000
commit0ed49044b06027b3542bc00ed63d9e8b8ec9cd53 (patch)
tree7ec2ca21115e5776cefabe7abfe9f8d20d60abbf /apps/plugins/sudoku
parentf53779d2f41fc2bcfff5196a279e2192992880e2 (diff)
downloadrockbox-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
Diffstat (limited to 'apps/plugins/sudoku')
-rw-r--r--apps/plugins/sudoku/sudoku.c31
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)
rb->memcpy(state,&new_state,sizeof(new_state));
rb->snprintf(str,sizeof(str),"Difficulty: %s",difficulty);
display_board(state);
- rb->splash(3*HZ, true, str);
+ rb->splash(HZ*3, true, str);
rb->strncpy(state->filename,GAME_FILE,MAX_PATH);
} else {
display_board(&new_state);
- rb->splash(2*HZ, true, "Aborted");
+ rb->splash(HZ*2, true, "Aborted");
}
return res;
}
-int sudoku_menu_cb(int key, int m)
-{
- (void)m;
- switch(key)
- {
-#ifdef MENU_ENTER2
- case MENU_ENTER2:
-#endif
- case MENU_ENTER:
- key = BUTTON_NONE; /* eat the downpress, next menu reacts on release */
- break;
-
-#ifdef MENU_ENTER2
- case MENU_ENTER2 | BUTTON_REL:
-#endif
- case MENU_ENTER | BUTTON_REL:
- key = MENU_ENTER; /* fake downpress, next menu doesn't like release */
- break;
- }
-
- return key;
-}
-
bool sudoku_menu(struct sudoku_state_t* state)
{
int m;
@@ -1017,7 +994,7 @@ bool sudoku_menu(struct sudoku_state_t* state)
};
m = rb->menu_init(items, sizeof(items) / sizeof(*items),
- sudoku_menu_cb, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL);
result=rb->menu_show(m);
@@ -1078,7 +1055,7 @@ int sudoku_edit_menu(struct sudoku_state_t* state)
};
m = rb->menu_init(items, sizeof(items) / sizeof(*items),
- sudoku_menu_cb, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL);
result=rb->menu_show(m);