diff options
Diffstat (limited to 'apps/plugins/xobox.c')
-rw-r--r-- | apps/plugins/xobox.c | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 94161c683d..f60938e900 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -315,25 +315,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
315 | #define DOWN BUTTON_DOWN | 315 | #define DOWN BUTTON_DOWN |
316 | #define PAUSE BUTTON_SELECT | 316 | #define PAUSE BUTTON_SELECT |
317 | 317 | ||
318 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD | 318 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD |
319 | |||
320 | #define QUIT BUTTON_POWER | ||
321 | #define LEFT BUTTON_PREV | ||
322 | #define RIGHT BUTTON_NEXT | ||
323 | #define UP BUTTON_HOME | ||
324 | #define DOWN BUTTON_OPTION | ||
325 | #define PAUSE BUTTON_PLAY | ||
326 | |||
327 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | ||
328 | |||
329 | #define QUIT BUTTON_POWER | ||
330 | #define LEFT BUTTON_PREV | ||
331 | #define RIGHT BUTTON_NEXT | ||
332 | #define UP BUTTON_HOME | ||
333 | #define DOWN BUTTON_OPTION | ||
334 | #define PAUSE BUTTON_PLAY | ||
335 | |||
336 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | ||
337 | 319 | ||
338 | #define QUIT BUTTON_POWER | 320 | #define QUIT BUTTON_POWER |
339 | #define LEFT BUTTON_PREV | 321 | #define LEFT BUTTON_PREV |
@@ -351,7 +333,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
351 | #define DOWN BUTTON_OPTION | 333 | #define DOWN BUTTON_OPTION |
352 | #define PAUSE BUTTON_PLAY | 334 | #define PAUSE BUTTON_PLAY |
353 | 335 | ||
354 | #elif CONFIG_KEYPAD == IHIFI_770_PAD | 336 | #elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD |
355 | 337 | ||
356 | #define QUIT BUTTON_POWER | 338 | #define QUIT BUTTON_POWER |
357 | #define LEFT BUTTON_HOME | 339 | #define LEFT BUTTON_HOME |
@@ -360,20 +342,16 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
360 | #define DOWN BUTTON_NEXT | 342 | #define DOWN BUTTON_NEXT |
361 | #define PAUSE BUTTON_PLAY | 343 | #define PAUSE BUTTON_PLAY |
362 | 344 | ||
363 | #elif CONFIG_KEYPAD == IHIFI_800_PAD | 345 | #elif CONFIG_KEYPAD == EROSQ_PAD |
364 | 346 | ||
365 | #define QUIT BUTTON_POWER | 347 | #define QUIT BUTTON_POWER |
366 | #define LEFT BUTTON_HOME | 348 | #define LEFT BUTTON_SCROLL_BACK |
367 | #define RIGHT BUTTON_VOL_DOWN | 349 | #define RIGHT BUTTON_SCROLL_FWD |
368 | #define UP BUTTON_PREV | 350 | #define UP BUTTON_PREV |
369 | #define DOWN BUTTON_NEXT | 351 | #define DOWN BUTTON_NEXT |
370 | #define PAUSE BUTTON_PLAY | 352 | #define PAUSE BUTTON_PLAY |
371 | 353 | ||
372 | #else | 354 | #elif defined(HAVE_TOUCHSCREEN) |
373 | #error No keymap defined! | ||
374 | #endif | ||
375 | |||
376 | #ifdef HAVE_TOUCHSCREEN | ||
377 | #ifndef QUIT | 355 | #ifndef QUIT |
378 | #define QUIT BUTTON_TOPLEFT | 356 | #define QUIT BUTTON_TOPLEFT |
379 | #endif | 357 | #endif |
@@ -392,6 +370,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
392 | #ifndef PAUSE | 370 | #ifndef PAUSE |
393 | #define PAUSE BUTTON_CENTER | 371 | #define PAUSE BUTTON_CENTER |
394 | #endif | 372 | #endif |
373 | #else | ||
374 | #error No keymap defined! | ||
395 | #endif | 375 | #endif |
396 | 376 | ||
397 | #define MOVE_NO 0 /* player movement */ | 377 | #define MOVE_NO 0 /* player movement */ |
@@ -734,7 +714,7 @@ static void refresh_board (void) | |||
734 | #else | 714 | #else |
735 | x = BOARD_X + CUBE_SIZE * BOARD_W - 40; | 715 | x = BOARD_X + CUBE_SIZE * BOARD_W - 40; |
736 | #endif | 716 | #endif |
737 | rb->lcd_putsxyf (x, BOARD_Y + CUBE_SIZE * BOARD_H - 8, | 717 | rb->lcd_putsxyf (x, BOARD_Y + CUBE_SIZE * BOARD_H - 8, |
738 | (player.lives != 1) ? "%d Lives" : "%d Life", player.lives); | 718 | (player.lives != 1) ? "%d Lives" : "%d Life", player.lives); |
739 | 719 | ||
740 | #if LCD_DEPTH>=2 | 720 | #if LCD_DEPTH>=2 |
@@ -1160,7 +1140,7 @@ static int xobox_menu_cb(int action, | |||
1160 | static int xobox_menu(bool ingame) | 1140 | static int xobox_menu(bool ingame) |
1161 | { | 1141 | { |
1162 | rb->button_clear_queue(); | 1142 | rb->button_clear_queue(); |
1163 | 1143 | ||
1164 | int selection = 0; | 1144 | int selection = 0; |
1165 | MENUITEM_STRINGLIST(main_menu, "Xobox Menu", xobox_menu_cb, | 1145 | MENUITEM_STRINGLIST(main_menu, "Xobox Menu", xobox_menu_cb, |
1166 | "Resume Game", "Start New Game", | 1146 | "Resume Game", "Start New Game", |