diff options
Diffstat (limited to 'apps/plugins/doom/rockdoom.c')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 763e9d5681..1e7c9fa13a 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -101,7 +101,6 @@ int my_close(int id) | |||
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | #endif | 103 | #endif |
104 | const struct plugin_api* rb; | ||
105 | #define MAXARGVS 100 | 104 | #define MAXARGVS 100 |
106 | 105 | ||
107 | bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates | 106 | bool noprintf=0; // Variable disables printf lcd updates to protect grayscale lib/direct lcd updates |
@@ -496,7 +495,7 @@ int Oset_keys() | |||
496 | { "Game Automap", NULL }, | 495 | { "Game Automap", NULL }, |
497 | }; | 496 | }; |
498 | 497 | ||
499 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), | 498 | m = menu_init(items, sizeof(items) / sizeof(*items), |
500 | NULL, NULL, NULL, NULL); | 499 | NULL, NULL, NULL, NULL); |
501 | 500 | ||
502 | while(!menuquit) | 501 | while(!menuquit) |
@@ -560,7 +559,7 @@ static bool Doptions() | |||
560 | #endif | 559 | #endif |
561 | }; | 560 | }; |
562 | 561 | ||
563 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), | 562 | m = menu_init(items, sizeof(items) / sizeof(*items), |
564 | NULL, NULL, NULL, NULL); | 563 | NULL, NULL, NULL, NULL); |
565 | 564 | ||
566 | while(!menuquit) | 565 | while(!menuquit) |
@@ -583,7 +582,7 @@ int menuchoice(struct menu_item *menu, int items) | |||
583 | { | 582 | { |
584 | int m, result; | 583 | int m, result; |
585 | 584 | ||
586 | m = menu_init(rb, menu, items,NULL, NULL, NULL, NULL); | 585 | m = menu_init(menu, items,NULL, NULL, NULL, NULL); |
587 | 586 | ||
588 | result= menu_show(m); | 587 | result= menu_show(m); |
589 | menu_exit(m); | 588 | menu_exit(m); |
@@ -633,7 +632,7 @@ int doom_menu() | |||
633 | while (rb->button_get(false) != BUTTON_NONE) | 632 | while (rb->button_get(false) != BUTTON_NONE) |
634 | rb->yield(); | 633 | rb->yield(); |
635 | 634 | ||
636 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), | 635 | m = menu_init(items, sizeof(items) / sizeof(*items), |
637 | NULL, NULL, NULL, NULL); | 636 | NULL, NULL, NULL, NULL); |
638 | 637 | ||
639 | while(!menuquit) | 638 | while(!menuquit) |
@@ -677,11 +676,10 @@ int doom_menu() | |||
677 | 676 | ||
678 | extern int systemvol; | 677 | extern int systemvol; |
679 | /* this is the plugin entry point */ | 678 | /* this is the plugin entry point */ |
680 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) | 679 | enum plugin_status plugin_start(const void* parameter) |
681 | { | 680 | { |
682 | PLUGIN_IRAM_INIT(api) | 681 | PLUGIN_IRAM_INIT(rb) |
683 | 682 | ||
684 | rb = api; | ||
685 | (void)parameter; | 683 | (void)parameter; |
686 | 684 | ||
687 | doomexit=0; | 685 | doomexit=0; |
@@ -741,7 +739,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
741 | systemvol= rb->global_settings->volume-rb->global_settings->volume%((rb->sound_max(SOUND_VOLUME)-rb->sound_min(SOUND_VOLUME))/15); | 739 | systemvol= rb->global_settings->volume-rb->global_settings->volume%((rb->sound_max(SOUND_VOLUME)-rb->sound_min(SOUND_VOLUME))/15); |
742 | general_translucency = default_translucency; // phares | 740 | general_translucency = default_translucency; // phares |
743 | 741 | ||
744 | backlight_force_on(rb); | 742 | backlight_force_on(); |
745 | #ifdef RB_PROFILE | 743 | #ifdef RB_PROFILE |
746 | rb->profile_thread(); | 744 | rb->profile_thread(); |
747 | #endif | 745 | #endif |
@@ -755,7 +753,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
755 | #ifdef RB_PROFILE | 753 | #ifdef RB_PROFILE |
756 | rb->profstop(); | 754 | rb->profstop(); |
757 | #endif | 755 | #endif |
758 | backlight_use_settings(rb); | 756 | backlight_use_settings(); |
759 | 757 | ||
760 | M_SaveDefaults (); | 758 | M_SaveDefaults (); |
761 | 759 | ||