diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/d_englsh.h | 2 | ||||
-rw-r--r-- | apps/plugins/doom/doomdef.h | 4 | ||||
-rw-r--r-- | apps/plugins/doom/m_menu.c | 19 | ||||
-rw-r--r-- | apps/plugins/doom/m_misc.c | 10 | ||||
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 11 |
5 files changed, 29 insertions, 17 deletions
diff --git a/apps/plugins/doom/d_englsh.h b/apps/plugins/doom/d_englsh.h index 596b8772e8..7f73ce8519 100644 --- a/apps/plugins/doom/d_englsh.h +++ b/apps/plugins/doom/d_englsh.h | |||
@@ -67,7 +67,7 @@ | |||
67 | #define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN | 67 | #define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN |
68 | #define RESTARTLEVEL "restart the level?\n\n"PRESSYN | 68 | #define RESTARTLEVEL "restart the level?\n\n"PRESSYN |
69 | 69 | ||
70 | #define DOSY "(press y to quit)" | 70 | #define DOSY "(press select to quit)" |
71 | 71 | ||
72 | #define DETAILHI "High detail" | 72 | #define DETAILHI "High detail" |
73 | #define DETAILLO "Low detail" | 73 | #define DETAILLO "Low detail" |
diff --git a/apps/plugins/doom/doomdef.h b/apps/plugins/doom/doomdef.h index 1910e7c48a..be586a511f 100644 --- a/apps/plugins/doom/doomdef.h +++ b/apps/plugins/doom/doomdef.h | |||
@@ -218,8 +218,8 @@ typedef enum { | |||
218 | #define KEY_UPARROW 0xad | 218 | #define KEY_UPARROW 0xad |
219 | #define KEY_DOWNARROW 0xaf | 219 | #define KEY_DOWNARROW 0xaf |
220 | #define KEY_ESCAPE 0x1B | 220 | #define KEY_ESCAPE 0x1B |
221 | #define KEY_ENTER 0x0D | 221 | #define KEY_ENTER 0x60 // Changed due to button reconfig - 0x0D |
222 | #define KEY_TAB 0x09 | 222 | #define KEY_TAB 0x61 // Changed due to button reconfig - 0x09 |
223 | #define KEY_F1 (0x80+0x3b) | 223 | #define KEY_F1 (0x80+0x3b) |
224 | #define KEY_F2 (0x80+0x3c) | 224 | #define KEY_F2 (0x80+0x3c) |
225 | #define KEY_F3 (0x80+0x3d) | 225 | #define KEY_F3 (0x80+0x3d) |
diff --git a/apps/plugins/doom/m_menu.c b/apps/plugins/doom/m_menu.c index 580503778e..6f01e066e1 100644 --- a/apps/plugins/doom/m_menu.c +++ b/apps/plugins/doom/m_menu.c | |||
@@ -16,7 +16,10 @@ | |||
16 | // GNU General Public License for more details. | 16 | // GNU General Public License for more details. |
17 | // | 17 | // |
18 | // $Log$ | 18 | // $Log$ |
19 | // Revision 1.3 2006/04/03 20:03:02 kkurbjun | 19 | // Revision 1.4 2006/04/04 23:13:50 kkurbjun |
20 | // Fix up configurable keys, edit exit string, more work needs to be done on menu keys | ||
21 | // | ||
22 | // Revision 1.3 2006-04-03 20:03:02 kkurbjun | ||
20 | // Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad | 23 | // Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad |
21 | // | 24 | // |
22 | // Revision 1.2 2006-04-03 00:28:13 kkurbjun | 25 | // Revision 1.2 2006-04-03 00:28:13 kkurbjun |
@@ -928,7 +931,7 @@ void M_DrawEpisode(void) | |||
928 | 931 | ||
929 | void M_VerifyNightmare(int ch) | 932 | void M_VerifyNightmare(int ch) |
930 | { | 933 | { |
931 | if (ch != KEY_ENTER) | 934 | if (ch != key_menu_enter) |
932 | return; | 935 | return; |
933 | 936 | ||
934 | G_DeferedInitNew(nightmare,epi+1,1); | 937 | G_DeferedInitNew(nightmare,epi+1,1); |
@@ -1030,7 +1033,7 @@ void M_ChangeMessages(int choice) | |||
1030 | // | 1033 | // |
1031 | void M_EndGameResponse(int ch) | 1034 | void M_EndGameResponse(int ch) |
1032 | { | 1035 | { |
1033 | if (ch != KEY_ENTER) | 1036 | if (ch != key_menu_enter) |
1034 | return; | 1037 | return; |
1035 | 1038 | ||
1036 | // killough 5/26/98: make endgame quit if recording or playing back demo | 1039 | // killough 5/26/98: make endgame quit if recording or playing back demo |
@@ -1118,7 +1121,7 @@ int quitsounds2[8] = | |||
1118 | 1121 | ||
1119 | void M_QuitResponse(int ch) | 1122 | void M_QuitResponse(int ch) |
1120 | { | 1123 | { |
1121 | if (ch != KEY_ENTER) | 1124 | if (ch != key_menu_enter) |
1122 | return; | 1125 | return; |
1123 | if (!netgame) | 1126 | if (!netgame) |
1124 | { | 1127 | { |
@@ -1391,7 +1394,7 @@ boolean M_Responder (event_t* ev) | |||
1391 | 1394 | ||
1392 | if (ev->data1&1) | 1395 | if (ev->data1&1) |
1393 | { | 1396 | { |
1394 | ch = KEY_ENTER; | 1397 | ch = key_menu_enter; |
1395 | joywait = I_GetTime() + 5; | 1398 | joywait = I_GetTime() + 5; |
1396 | } | 1399 | } |
1397 | if (ev->data1&2) | 1400 | if (ev->data1&2) |
@@ -1435,7 +1438,7 @@ boolean M_Responder (event_t* ev) | |||
1435 | 1438 | ||
1436 | if (ev->data1&1) | 1439 | if (ev->data1&1) |
1437 | { | 1440 | { |
1438 | ch = KEY_ENTER; | 1441 | ch = key_menu_enter; |
1439 | mousewait = I_GetTime() + 15; | 1442 | mousewait = I_GetTime() + 15; |
1440 | } | 1443 | } |
1441 | 1444 | ||
@@ -1501,7 +1504,7 @@ boolean M_Responder (event_t* ev) | |||
1501 | if (messageToPrint) | 1504 | if (messageToPrint) |
1502 | { | 1505 | { |
1503 | if (messageNeedsInput == true && | 1506 | if (messageNeedsInput == true && |
1504 | !(ch == ' ' || ch == 'n' || ch == KEY_ENTER || ch == KEY_ESCAPE)) | 1507 | !(ch == ' ' || ch == 'n' || ch == key_menu_enter || ch == key_menu_escape)) |
1505 | return false; | 1508 | return false; |
1506 | 1509 | ||
1507 | menuactive = messageLastMenuActive; | 1510 | menuactive = messageLastMenuActive; |
@@ -1566,7 +1569,7 @@ boolean M_Responder (event_t* ev) | |||
1566 | // Pop-up menu? | 1569 | // Pop-up menu? |
1567 | if (!menuactive) | 1570 | if (!menuactive) |
1568 | { | 1571 | { |
1569 | if (ch == KEY_ESCAPE) | 1572 | if (ch == key_menu_escape) |
1570 | { | 1573 | { |
1571 | M_StartControlPanel (); | 1574 | M_StartControlPanel (); |
1572 | S_StartSound(NULL,sfx_swtchn); | 1575 | S_StartSound(NULL,sfx_swtchn); |
diff --git a/apps/plugins/doom/m_misc.c b/apps/plugins/doom/m_misc.c index a7417f464a..43e2a3888b 100644 --- a/apps/plugins/doom/m_misc.c +++ b/apps/plugins/doom/m_misc.c | |||
@@ -355,10 +355,10 @@ default_t defaults[] = | |||
355 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move forward | 355 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move forward |
356 | {"key_down", {&key_down, NULL}, {KEY_DOWNARROW, NULL}, | 356 | {"key_down", {&key_down, NULL}, {KEY_DOWNARROW, NULL}, |
357 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move backward | 357 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move backward |
358 | /* {"key_menu_right", {&key_menu_right, NULL}, {KEY_RIGHTARROW, NULL},// phares 3/7/98 | 358 | {"key_menu_right", {&key_menu_right, NULL}, {KEY_RIGHTARROW, NULL},// phares 3/7/98 |
359 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move right in a menu // | | 359 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move right in a menu // | |
360 | {"key_menu_left", {&key_menu_left, NULL}, {KEY_LEFTARROW} ,// V | 360 | {"key_menu_left", {&key_menu_left, NULL}, {KEY_LEFTARROW, NULL} ,// V |
361 | 0,MAX_KEY,def_key,ss_keys, NULL}, // key to move left in a menu | 361 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move left in a menu |
362 | {"key_menu_up", {&key_menu_up, NULL}, {KEY_UPARROW,NULL} , | 362 | {"key_menu_up", {&key_menu_up, NULL}, {KEY_UPARROW,NULL} , |
363 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move up in a menu | 363 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move up in a menu |
364 | {"key_menu_down", {&key_menu_down, NULL}, {KEY_DOWNARROW, NULL} , | 364 | {"key_menu_down", {&key_menu_down, NULL}, {KEY_DOWNARROW, NULL} , |
@@ -369,7 +369,7 @@ default_t defaults[] = | |||
369 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to leave a menu , // phares 3/7/98 | 369 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to leave a menu , // phares 3/7/98 |
370 | {"key_menu_enter", {&key_menu_enter, NULL}, {KEY_ENTER, NULL} , | 370 | {"key_menu_enter", {&key_menu_enter, NULL}, {KEY_ENTER, NULL} , |
371 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu | 371 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu |
372 | */ | 372 | |
373 | {"key_strafeleft", {&key_strafeleft, NULL}, {',', NULL}, | 373 | {"key_strafeleft", {&key_strafeleft, NULL}, {',', NULL}, |
374 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to strafe left | 374 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to strafe left |
375 | {"key_straferight", {&key_straferight, NULL}, {'.', NULL}, | 375 | {"key_straferight", {&key_straferight, NULL}, {'.', NULL}, |
@@ -414,7 +414,7 @@ default_t defaults[] = | |||
414 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to enter a chat message | 414 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to enter a chat message |
415 | {"key_backspace", {&key_backspace, NULL}, {KEY_BACKSPACE, NULL}, | 415 | {"key_backspace", {&key_backspace, NULL}, {KEY_BACKSPACE, NULL}, |
416 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // backspace key | 416 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // backspace key |
417 | {"key_enter", {&key_enter, NULL}, {KEY_ENTER, NULL}, | 417 | {"key_enter", {&key_enter, NULL}, {0, NULL}, |
418 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu or see last message | 418 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu or see last message |
419 | {"key_map", {&key_map, NULL}, {KEY_TAB, NULL}, | 419 | {"key_map", {&key_map, NULL}, {KEY_TAB, NULL}, |
420 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to toggle automap display | 420 | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to toggle automap display |
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; |