diff options
Diffstat (limited to 'apps/plugins/doom/rockdoom.c')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 1081324974..82daadb24e 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "i_system.h" | 37 | #include "i_system.h" |
38 | #include "hu_stuff.h" | 38 | #include "hu_stuff.h" |
39 | #include "st_stuff.h" | 39 | #include "st_stuff.h" |
40 | #include "lib/oldmenuapi.h" | ||
40 | 41 | ||
41 | PLUGIN_HEADER | 42 | PLUGIN_HEADER |
42 | PLUGIN_IRAM_DECLARE | 43 | PLUGIN_IRAM_DECLARE |
@@ -490,12 +491,12 @@ int Oset_keys() | |||
490 | { "Game Automap", NULL }, | 491 | { "Game Automap", NULL }, |
491 | }; | 492 | }; |
492 | 493 | ||
493 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 494 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), |
494 | NULL, NULL, NULL, NULL); | 495 | NULL, NULL, NULL, NULL); |
495 | 496 | ||
496 | while(!menuquit) | 497 | while(!menuquit) |
497 | { | 498 | { |
498 | result=rb->menu_show(m); | 499 | result=menu_show(m); |
499 | if(result<0) | 500 | if(result<0) |
500 | menuquit=1; | 501 | menuquit=1; |
501 | else | 502 | else |
@@ -506,7 +507,7 @@ int Oset_keys() | |||
506 | } | 507 | } |
507 | } | 508 | } |
508 | 509 | ||
509 | rb->menu_exit(m); | 510 | menu_exit(m); |
510 | 511 | ||
511 | return (1); | 512 | return (1); |
512 | } | 513 | } |
@@ -554,12 +555,12 @@ static bool Doptions() | |||
554 | #endif | 555 | #endif |
555 | }; | 556 | }; |
556 | 557 | ||
557 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 558 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), |
558 | NULL, NULL, NULL, NULL); | 559 | NULL, NULL, NULL, NULL); |
559 | 560 | ||
560 | while(!menuquit) | 561 | while(!menuquit) |
561 | { | 562 | { |
562 | result=rb->menu_show(m); | 563 | result=menu_show(m); |
563 | if(result==0) | 564 | if(result==0) |
564 | Oset_keys(); | 565 | Oset_keys(); |
565 | else if (result > 0) | 566 | else if (result > 0) |
@@ -568,7 +569,7 @@ static bool Doptions() | |||
568 | menuquit=1; | 569 | menuquit=1; |
569 | } | 570 | } |
570 | 571 | ||
571 | rb->menu_exit(m); | 572 | menu_exit(m); |
572 | 573 | ||
573 | return (1); | 574 | return (1); |
574 | } | 575 | } |
@@ -577,10 +578,10 @@ int menuchoice(struct menu_item *menu, int items) | |||
577 | { | 578 | { |
578 | int m, result; | 579 | int m, result; |
579 | 580 | ||
580 | m = rb->menu_init(menu, items,NULL, NULL, NULL, NULL); | 581 | m = menu_init(rb, menu, items,NULL, NULL, NULL, NULL); |
581 | 582 | ||
582 | result= rb->menu_show(m); | 583 | result= menu_show(m); |
583 | rb->menu_exit(m); | 584 | menu_exit(m); |
584 | if(result<items && result>=0) | 585 | if(result<items && result>=0) |
585 | return result; | 586 | return result; |
586 | return 0; | 587 | return 0; |
@@ -627,12 +628,12 @@ int doom_menu() | |||
627 | while (rb->button_get(false) != BUTTON_NONE) | 628 | while (rb->button_get(false) != BUTTON_NONE) |
628 | rb->yield(); | 629 | rb->yield(); |
629 | 630 | ||
630 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 631 | m = menu_init(rb, items, sizeof(items) / sizeof(*items), |
631 | NULL, NULL, NULL, NULL); | 632 | NULL, NULL, NULL, NULL); |
632 | 633 | ||
633 | while(!menuquit) | 634 | while(!menuquit) |
634 | { | 635 | { |
635 | result=rb->menu_show(m); | 636 | result=menu_show(m); |
636 | switch (result) { | 637 | switch (result) { |
637 | case 0: /* Game picker */ | 638 | case 0: /* Game picker */ |
638 | rb->set_option("Game WAD", &gamever, INT, names, status, NULL ); | 639 | rb->set_option("Game WAD", &gamever, INT, names, status, NULL ); |
@@ -664,7 +665,7 @@ int doom_menu() | |||
664 | } | 665 | } |
665 | } | 666 | } |
666 | 667 | ||
667 | rb->menu_exit(m); | 668 | menu_exit(m); |
668 | 669 | ||
669 | return (gamever); | 670 | return (gamever); |
670 | } | 671 | } |