diff options
author | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-07-08 18:10:14 +0000 |
---|---|---|
committer | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-07-08 18:10:14 +0000 |
commit | b0179dcd23dc1c1c7743278a037843e320f25dda (patch) | |
tree | dcbf5e61edd1c65dab430d04601d14a5e6834c0a /apps/plugins | |
parent | 269ed8a4158025d118740f2f3838ff856280b64e (diff) | |
download | rockbox-b0179dcd23dc1c1c7743278a037843e320f25dda.tar.gz rockbox-b0179dcd23dc1c1c7743278a037843e320f25dda.zip |
add keymap for m300 and fix warnings of previous patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21723 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/clix.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 4768859762..24b1e8e00b 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -112,6 +112,14 @@ PLUGIN_HEADER | |||
112 | #define CLIX_BUTTON_UP BUTTON_UP | 112 | #define CLIX_BUTTON_UP BUTTON_UP |
113 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | 113 | #define CLIX_BUTTON_DOWN BUTTON_DOWN |
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
116 | #define CLIX_BUTTON_QUIT BUTTON_OFF | ||
117 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | ||
118 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | ||
119 | #define CLIX_BUTTON_CLICK BUTTON_SELECT | ||
120 | #define CLIX_BUTTON_UP BUTTON_UP | ||
121 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | ||
122 | |||
115 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 123 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
116 | #define CLIX_BUTTON_QUIT BUTTON_BACK | 124 | #define CLIX_BUTTON_QUIT BUTTON_BACK |
117 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 125 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
@@ -203,7 +211,7 @@ struct highscore highest[NUM_SCORES]; | |||
203 | struct clix_game_state_t { | 211 | struct clix_game_state_t { |
204 | unsigned char level; /* current level */ | 212 | unsigned char level; /* current level */ |
205 | char x,y; /* current positions of the cursor */ | 213 | char x,y; /* current positions of the cursor */ |
206 | char board[BOARD_WIDTH * BOARD_HEIGHT]; /* play board*/ | 214 | int board[BOARD_WIDTH * BOARD_HEIGHT]; /* play board*/ |
207 | /* state of selected fields,maybe we can store this in the play board too */ | 215 | /* state of selected fields,maybe we can store this in the play board too */ |
208 | bool board_selected[ BOARD_WIDTH * BOARD_HEIGHT]; | 216 | bool board_selected[ BOARD_WIDTH * BOARD_HEIGHT]; |
209 | char selected_count; | 217 | char selected_count; |