diff options
Diffstat (limited to 'apps/plugins/rockblox.c')
-rw-r--r-- | apps/plugins/rockblox.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 0526bd5d46..11fd118dc1 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -41,8 +41,6 @@ PLUGIN_HEADER | |||
41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) | 41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) |
42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) | 42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) |
43 | 43 | ||
44 | #define SCROLL_WHEEL | ||
45 | |||
46 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 44 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
47 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 45 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
48 | 46 | ||
@@ -116,6 +114,7 @@ PLUGIN_HEADER | |||
116 | 114 | ||
117 | #define ROCKBLOX_OFF BUTTON_POWER | 115 | #define ROCKBLOX_OFF BUTTON_POWER |
118 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 116 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
117 | #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP | ||
119 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 118 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
120 | #define ROCKBLOX_DOWN BUTTON_DOWN | 119 | #define ROCKBLOX_DOWN BUTTON_DOWN |
121 | #define ROCKBLOX_LEFT BUTTON_LEFT | 120 | #define ROCKBLOX_LEFT BUTTON_LEFT |
@@ -127,14 +126,13 @@ PLUGIN_HEADER | |||
127 | 126 | ||
128 | #define ROCKBLOX_OFF BUTTON_POWER | 127 | #define ROCKBLOX_OFF BUTTON_POWER |
129 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 128 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
129 | #define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP | ||
130 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 130 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
131 | #define ROCKBLOX_DOWN BUTTON_DOWN | 131 | #define ROCKBLOX_DOWN BUTTON_DOWN |
132 | #define ROCKBLOX_LEFT BUTTON_LEFT | 132 | #define ROCKBLOX_LEFT BUTTON_LEFT |
133 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 133 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
134 | #define ROCKBLOX_DROP BUTTON_SELECT | 134 | #define ROCKBLOX_DROP BUTTON_SELECT |
135 | /* TODO: | 135 | #define ROCKBLOX_RESTART BUTTON_HOME |
136 | #define ROCKBLOX_RESTART BUTTON_HOME */ | ||
137 | #define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN | ||
138 | 136 | ||
139 | 137 | ||
140 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 138 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
@@ -584,7 +582,7 @@ static bool gameover = false; | |||
584 | static int lines = 0, level = 0, score = 0, cx, cy, cf, co, nf; | 582 | static int lines = 0, level = 0, score = 0, cx, cy, cf, co, nf; |
585 | static short board[BOARD_HEIGHT][BOARD_WIDTH]; /* 20 rows of 10 blocks */ | 583 | static short board[BOARD_HEIGHT][BOARD_WIDTH]; /* 20 rows of 10 blocks */ |
586 | 584 | ||
587 | #ifdef SCROLL_WHEEL | 585 | #ifdef HAVE_SCROLLWHEEL |
588 | int wheel_events = 0, last_wheel_event = 0; | 586 | int wheel_events = 0, last_wheel_event = 0; |
589 | bool wheel_enabled = false; | 587 | bool wheel_enabled = false; |
590 | #endif | 588 | #endif |
@@ -1110,7 +1108,7 @@ static int rockblox_loop (void) | |||
1110 | #endif | 1108 | #endif |
1111 | case ROCKBLOX_ROTATE_RIGHT: | 1109 | case ROCKBLOX_ROTATE_RIGHT: |
1112 | case ROCKBLOX_ROTATE_RIGHT | BUTTON_REPEAT: | 1110 | case ROCKBLOX_ROTATE_RIGHT | BUTTON_REPEAT: |
1113 | #ifdef SCROLL_WHEEL | 1111 | #ifdef HAVE_SCROLLWHEEL |
1114 | /* if the wheel is disabled, add an event to the stack. */ | 1112 | /* if the wheel is disabled, add an event to the stack. */ |
1115 | if(wheel_enabled == false) | 1113 | if(wheel_enabled == false) |
1116 | wheel_events++; | 1114 | wheel_events++; |
@@ -1123,7 +1121,7 @@ static int rockblox_loop (void) | |||
1123 | 1121 | ||
1124 | case ROCKBLOX_ROTATE_LEFT: | 1122 | case ROCKBLOX_ROTATE_LEFT: |
1125 | case ROCKBLOX_ROTATE_LEFT | BUTTON_REPEAT: | 1123 | case ROCKBLOX_ROTATE_LEFT | BUTTON_REPEAT: |
1126 | #ifdef SCROLL_WHEEL | 1124 | #ifdef HAVE_SCROLLWHEEL |
1127 | if(wheel_enabled == false) | 1125 | if(wheel_enabled == false) |
1128 | wheel_events++; | 1126 | wheel_events++; |
1129 | 1127 | ||
@@ -1179,7 +1177,7 @@ static int rockblox_loop (void) | |||
1179 | if (button != BUTTON_NONE) | 1177 | if (button != BUTTON_NONE) |
1180 | lastbutton = button; | 1178 | lastbutton = button; |
1181 | 1179 | ||
1182 | #ifdef SCROLL_WHEEL | 1180 | #ifdef HAVE_SCROLLWHEEL |
1183 | /* check if we should enable the scroll wheel, if events | 1181 | /* check if we should enable the scroll wheel, if events |
1184 | * begin to stack up... */ | 1182 | * begin to stack up... */ |
1185 | if(wheel_enabled == false) | 1183 | if(wheel_enabled == false) |