diff options
Diffstat (limited to 'apps/plugins/doom')
-rw-r--r-- | apps/plugins/doom/i_video.c | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index cd3cd90edd..1fb913fbed 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -566,18 +566,7 @@ void I_ShutdownGraphics(void) | |||
566 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 566 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
567 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 567 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
568 | 568 | ||
569 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | 569 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD |
570 | #define DOOMBUTTON_UP BUTTON_HOME | ||
571 | #define DOOMBUTTON_DOWN BUTTON_OPTION | ||
572 | #define DOOMBUTTON_LEFT BUTTON_PREV | ||
573 | #define DOOMBUTTON_RIGHT BUTTON_NEXT | ||
574 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | ||
575 | #define DOOMBUTTON_OPEN (BUTTON_HOME | BUTTON_POWER) | ||
576 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
577 | #define DOOMBUTTON_ENTER BUTTON_PLAY | ||
578 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | ||
579 | |||
580 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | ||
581 | #define DOOMBUTTON_UP BUTTON_HOME | 570 | #define DOOMBUTTON_UP BUTTON_HOME |
582 | #define DOOMBUTTON_DOWN BUTTON_OPTION | 571 | #define DOOMBUTTON_DOWN BUTTON_OPTION |
583 | #define DOOMBUTTON_LEFT BUTTON_PREV | 572 | #define DOOMBUTTON_LEFT BUTTON_PREV |
@@ -599,7 +588,7 @@ void I_ShutdownGraphics(void) | |||
599 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 588 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
600 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 589 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
601 | 590 | ||
602 | #elif CONFIG_KEYPAD == IHIFI_770_PAD | 591 | #elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD |
603 | #define DOOMBUTTON_UP BUTTON_PREV | 592 | #define DOOMBUTTON_UP BUTTON_PREV |
604 | #define DOOMBUTTON_DOWN BUTTON_NEXT | 593 | #define DOOMBUTTON_DOWN BUTTON_NEXT |
605 | #define DOOMBUTTON_LEFT BUTTON_HOME | 594 | #define DOOMBUTTON_LEFT BUTTON_HOME |
@@ -611,17 +600,17 @@ void I_ShutdownGraphics(void) | |||
611 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 600 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) |
612 | #define DOOMBUTTON_MAP (BUTTON_POWER|BUTTON_REPEAT) | 601 | #define DOOMBUTTON_MAP (BUTTON_POWER|BUTTON_REPEAT) |
613 | 602 | ||
614 | #elif CONFIG_KEYPAD == IHIFI_800_PAD | 603 | #elif CONFIG_KEYPAD == EROSQ_PAD |
615 | #define DOOMBUTTON_UP BUTTON_PREV | 604 | #define DOOMBUTTON_UP BUTTON_PREV |
616 | #define DOOMBUTTON_DOWN BUTTON_NEXT | 605 | #define DOOMBUTTON_DOWN BUTTON_NEXT |
617 | #define DOOMBUTTON_LEFT BUTTON_HOME | 606 | #define DOOMBUTTON_LEFT BUTTON_SCROLL_BACK |
618 | #define DOOMBUTTON_RIGHT BUTTON_VOL_DOWN | 607 | #define DOOMBUTTON_RIGHT BUTTON_SCROLL_FWD |
619 | #define DOOMBUTTON_OPEN BUTTON_PLAY | 608 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
620 | #define DOOMBUTTON_ESC BUTTON_POWER | 609 | #define DOOMBUTTON_OPEN BUTTON_BACK |
621 | #define DOOMBUTTON_ENTER BUTTON_VOL_UP | 610 | #define DOOMBUTTON_ESC BUTTON_MENU |
622 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP | 611 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
623 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 612 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
624 | #define DOOMBUTTON_MAP (BUTTON_POWER|BUTTON_REPEAT) | 613 | #define DOOMBUTTON_MAP BUTTON_VOL_DOWN |
625 | 614 | ||
626 | #else | 615 | #else |
627 | #error Keymap not defined! | 616 | #error Keymap not defined! |
@@ -745,7 +734,7 @@ static inline void getkey() | |||
745 | D_PostEvent(&event); | 734 | D_PostEvent(&event); |
746 | } | 735 | } |
747 | #endif | 736 | #endif |
748 | #endif | 737 | #endif |
749 | newbuttonstate = rb->button_status(); | 738 | newbuttonstate = rb->button_status(); |
750 | #ifdef DOOMBUTTON_SCROLLWHEEL | 739 | #ifdef DOOMBUTTON_SCROLLWHEEL |
751 | newbuttonstate |= read_scroll_wheel(); | 740 | newbuttonstate |= read_scroll_wheel(); |
@@ -954,7 +943,7 @@ void I_FinishUpdate (void) | |||
954 | { | 943 | { |
955 | int count; | 944 | int count; |
956 | byte *src = d_screens[0]; | 945 | byte *src = d_screens[0]; |
957 | 946 | ||
958 | #if (CONFIG_LCD == LCD_H300) && !defined(SIMULATOR) | 947 | #if (CONFIG_LCD == LCD_H300) && !defined(SIMULATOR) |
959 | count = SCREENWIDTH*SCREENHEIGHT; | 948 | count = SCREENWIDTH*SCREENHEIGHT; |
960 | 949 | ||
@@ -1091,7 +1080,7 @@ void I_FinishUpdate (void) | |||
1091 | *dst++ = palette[*src++]; | 1080 | *dst++ = palette[*src++]; |
1092 | while (--count); | 1081 | while (--count); |
1093 | } | 1082 | } |
1094 | rb->lcd_update(); | 1083 | rb->lcd_update(); |
1095 | #else /* !HAVE_LCD_COLOR */ | 1084 | #else /* !HAVE_LCD_COLOR */ |
1096 | 1085 | ||
1097 | unsigned char *dst; | 1086 | unsigned char *dst; |
@@ -1108,8 +1097,8 @@ void I_FinishUpdate (void) | |||
1108 | 1097 | ||
1109 | grey_ub_gray_bitmap(greybuffer, 0, y, SCREENWIDTH, 1); | 1098 | grey_ub_gray_bitmap(greybuffer, 0, y, SCREENWIDTH, 1); |
1110 | } | 1099 | } |
1111 | #endif | 1100 | #endif |
1112 | #endif | 1101 | #endif |
1113 | } | 1102 | } |
1114 | 1103 | ||
1115 | // | 1104 | // |
@@ -1136,7 +1125,7 @@ void I_InitGraphics(void) | |||
1136 | printf("Starting Graphics engine\n"); | 1125 | printf("Starting Graphics engine\n"); |
1137 | 1126 | ||
1138 | noprintf=1; | 1127 | noprintf=1; |
1139 | 1128 | ||
1140 | #if defined(HAVE_LCD_MODES) | 1129 | #if defined(HAVE_LCD_MODES) |
1141 | #if (HAVE_LCD_MODES & LCD_MODE_PAL256) | 1130 | #if (HAVE_LCD_MODES & LCD_MODE_PAL256) |
1142 | rb->lcd_set_mode(LCD_MODE_PAL256); | 1131 | rb->lcd_set_mode(LCD_MODE_PAL256); |