diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-04 23:13:50 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2006-04-04 23:13:50 +0000 |
commit | 8ae680269737abfe911631dc6166c5cf57570409 (patch) | |
tree | 8afac2616c5d907203ddb5a04fb720a464da9446 /apps/plugins/doom/rockdoom.c | |
parent | 6171be84da12c44e8c625cdd84fa8c1ae428a9e0 (diff) | |
download | rockbox-8ae680269737abfe911631dc6166c5cf57570409.tar.gz rockbox-8ae680269737abfe911631dc6166c5cf57570409.zip |
Fix up configurable keys, edit exit string, more work needs to be done on menu keys
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9506 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/rockdoom.c')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index de118a60c1..a6cceaa88c 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -482,6 +482,7 @@ int translatekey(int key) | |||
482 | return 'w'; | 482 | return 'w'; |
483 | case 9: | 483 | case 9: |
484 | return KEY_ENTER; | 484 | return KEY_ENTER; |
485 | case 10: | ||
485 | default: | 486 | default: |
486 | return 0; | 487 | return 0; |
487 | } | 488 | } |
@@ -510,6 +511,7 @@ int translatekey(int key) | |||
510 | return 8; | 511 | return 8; |
511 | case KEY_ENTER: | 512 | case KEY_ENTER: |
512 | return 9; | 513 | return 9; |
514 | case KEY_F9: | ||
513 | default: | 515 | default: |
514 | return 0; | 516 | return 0; |
515 | } | 517 | } |
@@ -547,6 +549,7 @@ int Oset_keys() | |||
547 | { "Game Open", NULL }, | 549 | { "Game Open", NULL }, |
548 | { "Game Strafe", NULL }, | 550 | { "Game Strafe", NULL }, |
549 | { "Game Weapon", NULL }, | 551 | { "Game Weapon", NULL }, |
552 | { "Game Automap", NULL }, | ||
550 | }; | 553 | }; |
551 | 554 | ||
552 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), | 555 | m = rb->menu_init(items, sizeof(items) / sizeof(*items), |
@@ -601,10 +604,16 @@ int Oset_keys() | |||
601 | 604 | ||
602 | case 7: | 605 | case 7: |
603 | key_weapon=translatekey(key_weapon); | 606 | key_weapon=translatekey(key_weapon); |
604 | rb->set_option(items[6].desc, &key_weapon, INT, doomkeys, numdoomkeys, NULL ); | 607 | rb->set_option(items[7].desc, &key_weapon, INT, doomkeys, numdoomkeys, NULL ); |
605 | key_weapon=translatekey(key_weapon); | 608 | key_weapon=translatekey(key_weapon); |
606 | break; | 609 | break; |
607 | 610 | ||
611 | case 8: | ||
612 | key_map=translatekey(key_map); | ||
613 | rb->set_option(items[8].desc, &key_map, INT, doomkeys, numdoomkeys, NULL ); | ||
614 | key_map=translatekey(key_map); | ||
615 | break; | ||
616 | |||
608 | default: | 617 | default: |
609 | menuquit=1; | 618 | menuquit=1; |
610 | break; | 619 | break; |