diff options
Diffstat (limited to 'apps/plugins/minesweeper.c')
-rw-r--r-- | apps/plugins/minesweeper.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 4af467b516..ea278df59c 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -41,6 +41,8 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
41 | 41 | ||
42 | /* variable button definitions */ | 42 | /* variable button definitions */ |
43 | #if CONFIG_KEYPAD == RECORDER_PAD | 43 | #if CONFIG_KEYPAD == RECORDER_PAD |
44 | #define MINESWP_UP BUTTON_UP | ||
45 | #define MINESWP_DOWN BUTTON_DOWN | ||
44 | #define MINESWP_QUIT BUTTON_OFF | 46 | #define MINESWP_QUIT BUTTON_OFF |
45 | #define MINESWP_START BUTTON_ON | 47 | #define MINESWP_START BUTTON_ON |
46 | #define MINESWP_TOGGLE BUTTON_PLAY | 48 | #define MINESWP_TOGGLE BUTTON_PLAY |
@@ -50,6 +52,8 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
50 | #define MINESWP_INFO BUTTON_F3 | 52 | #define MINESWP_INFO BUTTON_F3 |
51 | 53 | ||
52 | #elif CONFIG_KEYPAD == ONDIO_PAD | 54 | #elif CONFIG_KEYPAD == ONDIO_PAD |
55 | #define MINESWP_UP BUTTON_UP | ||
56 | #define MINESWP_DOWN BUTTON_DOWN | ||
53 | #define MINESWP_QUIT BUTTON_OFF | 57 | #define MINESWP_QUIT BUTTON_OFF |
54 | #define MINESWP_START BUTTON_MENU | 58 | #define MINESWP_START BUTTON_MENU |
55 | #define MINESWP_TOGGLE_PRE BUTTON_MENU | 59 | #define MINESWP_TOGGLE_PRE BUTTON_MENU |
@@ -59,12 +63,23 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
59 | 63 | ||
60 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 64 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
61 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 65 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
66 | #define MINESWP_UP BUTTON_UP | ||
67 | #define MINESWP_DOWN BUTTON_DOWN | ||
62 | #define MINESWP_QUIT BUTTON_OFF | 68 | #define MINESWP_QUIT BUTTON_OFF |
63 | #define MINESWP_START BUTTON_SELECT | 69 | #define MINESWP_START BUTTON_SELECT |
64 | #define MINESWP_TOGGLE BUTTON_SELECT | 70 | #define MINESWP_TOGGLE BUTTON_SELECT |
65 | #define MINESWP_DISCOVER BUTTON_ON | 71 | #define MINESWP_DISCOVER BUTTON_ON |
66 | #define MINESWP_INFO BUTTON_MODE | 72 | #define MINESWP_INFO BUTTON_MODE |
67 | 73 | ||
74 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
75 | #define MINESWP_UP BUTTON_SCROLL_BACK | ||
76 | #define MINESWP_DOWN BUTTON_SCROLL_FWD | ||
77 | #define MINESWP_QUIT BUTTON_MENU | ||
78 | #define MINESWP_START BUTTON_SELECT | ||
79 | #define MINESWP_TOGGLE BUTTON_PLAY | ||
80 | #define MINESWP_DISCOVER (BUTTON_SELECT | BUTTON_PLAY) | ||
81 | #define MINESWP_INFO (BUTTON_SELECT | BUTTON_MENU) | ||
82 | |||
68 | #endif | 83 | #endif |
69 | 84 | ||
70 | /* here is a global api struct pointer. while not strictly necessary, | 85 | /* here is a global api struct pointer. while not strictly necessary, |
@@ -323,11 +338,11 @@ int minesweeper(void) | |||
323 | 338 | ||
324 | button = rb->button_get(true); | 339 | button = rb->button_get(true); |
325 | switch(button){ | 340 | switch(button){ |
326 | case BUTTON_DOWN: | 341 | case MINESWP_DOWN: |
327 | p = (p + 98)%100; | 342 | p = (p + 98)%100; |
328 | break; | 343 | break; |
329 | 344 | ||
330 | case BUTTON_UP: | 345 | case MINESWP_UP: |
331 | p = (p + 2)%100; | 346 | p = (p + 2)%100; |
332 | break; | 347 | break; |
333 | 348 | ||
@@ -431,14 +446,14 @@ int minesweeper(void) | |||
431 | break; | 446 | break; |
432 | 447 | ||
433 | /* move cursor down */ | 448 | /* move cursor down */ |
434 | case BUTTON_DOWN: | 449 | case MINESWP_DOWN: |
435 | case (BUTTON_DOWN | BUTTON_REPEAT): | 450 | case (MINESWP_DOWN | BUTTON_REPEAT): |
436 | y = (y + 1)%height; | 451 | y = (y + 1)%height; |
437 | break; | 452 | break; |
438 | 453 | ||
439 | /* move cursor up */ | 454 | /* move cursor up */ |
440 | case BUTTON_UP: | 455 | case MINESWP_UP: |
441 | case (BUTTON_UP | BUTTON_REPEAT): | 456 | case (MINESWP_UP | BUTTON_REPEAT): |
442 | y = (y + height - 1)%height; | 457 | y = (y + height - 1)%height; |
443 | break; | 458 | break; |
444 | 459 | ||