devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix up configurable keys, edit exit string, more work needs to be done on menu keys

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9506 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Karl Kurbjun 2006-04-04 23:13:50 +00:00
parent 6171be84da
commit 8ae6802697
5 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/doom/d_englsh.h
View file

@ -67,7 +67,7 @@
#define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN #define ENDGAME "are you sure you want to end the game?\n\n"PRESSYN
#define RESTARTLEVEL "restart the level?\n\n"PRESSYN #define RESTARTLEVEL "restart the level?\n\n"PRESSYN
#define DOSY "(press y to quit)" #define DOSY "(press select to quit)"
#define DETAILHI "High detail" #define DETAILHI "High detail"
#define DETAILLO "Low detail" #define DETAILLO "Low detail"

4
apps/plugins/doom/doomdef.h
View file

@ -218,8 +218,8 @@ typedef enum {
#define KEY_UPARROW 0xad #define KEY_UPARROW 0xad
#define KEY_DOWNARROW 0xaf #define KEY_DOWNARROW 0xaf
#define KEY_ESCAPE 0x1B #define KEY_ESCAPE 0x1B
#define KEY_ENTER 0x0D #define KEY_ENTER 0x60 // Changed due to button reconfig - 0x0D
#define KEY_TAB 0x09 #define KEY_TAB 0x61 // Changed due to button reconfig - 0x09
#define KEY_F1 (0x80+0x3b) #define KEY_F1 (0x80+0x3b)
#define KEY_F2 (0x80+0x3c) #define KEY_F2 (0x80+0x3c)
#define KEY_F3 (0x80+0x3d) #define KEY_F3 (0x80+0x3d)

19
apps/plugins/doom/m_menu.c
View file

@ -16,7 +16,10 @@
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// $Log$ // $Log$
// Revision 1.3 2006/04/03 20:03:02 kkurbjun // Revision 1.4 2006/04/04 23:13:50 kkurbjun
// Fix up configurable keys, edit exit string, more work needs to be done on menu keys
//
// Revision 1.3 2006-04-03 20:03:02 kkurbjun
// Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad // Updates doom menu w/ new graphics, now requires rockdoom.wad: http://alamode.mines.edu/~kkurbjun/rockdoom.wad
// //
// Revision 1.2 2006-04-03 00:28:13 kkurbjun // Revision 1.2 2006-04-03 00:28:13 kkurbjun
@ -928,7 +931,7 @@ void M_DrawEpisode(void)
void M_VerifyNightmare(int ch) void M_VerifyNightmare(int ch)
{ {
if (ch != KEY_ENTER) if (ch != key_menu_enter)
return; return;
G_DeferedInitNew(nightmare,epi+1,1); G_DeferedInitNew(nightmare,epi+1,1);
@ -1030,7 +1033,7 @@ void M_ChangeMessages(int choice)
// //
void M_EndGameResponse(int ch) void M_EndGameResponse(int ch)
{ {
if (ch != KEY_ENTER) if (ch != key_menu_enter)
return; return;
// killough 5/26/98: make endgame quit if recording or playing back demo // killough 5/26/98: make endgame quit if recording or playing back demo
@ -1118,7 +1121,7 @@ int quitsounds2[8] =
void M_QuitResponse(int ch) void M_QuitResponse(int ch)
{ {
if (ch != KEY_ENTER) if (ch != key_menu_enter)
return; return;
if (!netgame) if (!netgame)
{ {
@ -1391,7 +1394,7 @@ boolean M_Responder (event_t* ev)
if (ev->data1&1) if (ev->data1&1)
{ {
ch = KEY_ENTER; ch = key_menu_enter;
joywait = I_GetTime() + 5; joywait = I_GetTime() + 5;
} }
if (ev->data1&2) if (ev->data1&2)
@ -1435,7 +1438,7 @@ boolean M_Responder (event_t* ev)
if (ev->data1&1) if (ev->data1&1)
{ {
ch = KEY_ENTER; ch = key_menu_enter;
mousewait = I_GetTime() + 15; mousewait = I_GetTime() + 15;
} }
@ -1501,7 +1504,7 @@ boolean M_Responder (event_t* ev)
if (messageToPrint) if (messageToPrint)
{ {
if (messageNeedsInput == true && if (messageNeedsInput == true &&
!(ch == ' ' || ch == 'n' || ch == KEY_ENTER || ch == KEY_ESCAPE)) !(ch == ' ' || ch == 'n' || ch == key_menu_enter || ch == key_menu_escape))
return false; return false;
menuactive = messageLastMenuActive; menuactive = messageLastMenuActive;
@ -1566,7 +1569,7 @@ boolean M_Responder (event_t* ev)
// Pop-up menu? // Pop-up menu?
if (!menuactive) if (!menuactive)
{ {
if (ch == KEY_ESCAPE) if (ch == key_menu_escape)
{ {
M_StartControlPanel (); M_StartControlPanel ();
S_StartSound(NULL,sfx_swtchn); S_StartSound(NULL,sfx_swtchn);

10
apps/plugins/doom/m_misc.c
View file

@ -355,10 +355,10 @@ default_t defaults[] =
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move forward 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move forward
{"key_down", {&key_down, NULL}, {KEY_DOWNARROW, NULL}, {"key_down", {&key_down, NULL}, {KEY_DOWNARROW, NULL},
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move backward 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move backward
/* {"key_menu_right", {&key_menu_right, NULL}, {KEY_RIGHTARROW, NULL},// phares 3/7/98 {"key_menu_right", {&key_menu_right, NULL}, {KEY_RIGHTARROW, NULL},// phares 3/7/98
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move right in a menu // | 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move right in a menu // |
{"key_menu_left", {&key_menu_left, NULL}, {KEY_LEFTARROW} ,// V {"key_menu_left", {&key_menu_left, NULL}, {KEY_LEFTARROW, NULL} ,// V
0,MAX_KEY,def_key,ss_keys, NULL}, // key to move left in a menu 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move left in a menu
{"key_menu_up", {&key_menu_up, NULL}, {KEY_UPARROW,NULL} , {"key_menu_up", {&key_menu_up, NULL}, {KEY_UPARROW,NULL} ,
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move up in a menu 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move up in a menu
{"key_menu_down", {&key_menu_down, NULL}, {KEY_DOWNARROW, NULL} , {"key_menu_down", {&key_menu_down, NULL}, {KEY_DOWNARROW, NULL} ,
@ -369,7 +369,7 @@ default_t defaults[] =
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to leave a menu , // phares 3/7/98 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to leave a menu , // phares 3/7/98
{"key_menu_enter", {&key_menu_enter, NULL}, {KEY_ENTER, NULL} , {"key_menu_enter", {&key_menu_enter, NULL}, {KEY_ENTER, NULL} ,
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu
*/
{"key_strafeleft", {&key_strafeleft, NULL}, {',', NULL}, {"key_strafeleft", {&key_strafeleft, NULL}, {',', NULL},
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to strafe left 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to strafe left
{"key_straferight", {&key_straferight, NULL}, {'.', NULL}, {"key_straferight", {&key_straferight, NULL}, {'.', NULL},
@ -414,7 +414,7 @@ default_t defaults[] =
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to enter a chat message 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to enter a chat message
{"key_backspace", {&key_backspace, NULL}, {KEY_BACKSPACE, NULL}, {"key_backspace", {&key_backspace, NULL}, {KEY_BACKSPACE, NULL},
0,MAX_KEY,def_key,ss_keys, 0, 0}, // backspace key 0,MAX_KEY,def_key,ss_keys, 0, 0}, // backspace key
{"key_enter", {&key_enter, NULL}, {KEY_ENTER, NULL}, {"key_enter", {&key_enter, NULL}, {0, NULL},
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu or see last message 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu or see last message
{"key_map", {&key_map, NULL}, {KEY_TAB, NULL}, {"key_map", {&key_map, NULL}, {KEY_TAB, NULL},
0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to toggle automap display 0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to toggle automap display

11
apps/plugins/doom/rockdoom.c
View file

@ -482,6 +482,7 @@ int translatekey(int key)
return 'w'; return 'w';
case 9: case 9:
return KEY_ENTER; return KEY_ENTER;
case 10:
default: default:
return 0; return 0;
} }
@ -510,6 +511,7 @@ int translatekey(int key)
return 8; return 8;
case KEY_ENTER: case KEY_ENTER:
return 9; return 9;
case KEY_F9:
default: default:
return 0; return 0;
} }
@ -547,6 +549,7 @@ int Oset_keys()
{ "Game Open", NULL }, { "Game Open", NULL },
{ "Game Strafe", NULL }, { "Game Strafe", NULL },
{ "Game Weapon", NULL }, { "Game Weapon", NULL },
{ "Game Automap", NULL },
}; };
m = rb->menu_init(items, sizeof(items) / sizeof(*items), m = rb->menu_init(items, sizeof(items) / sizeof(*items),
@ -601,10 +604,16 @@ int Oset_keys()
case 7: case 7:
key_weapon=translatekey(key_weapon); key_weapon=translatekey(key_weapon);
rb->set_option(items[6].desc, &key_weapon, INT, doomkeys, numdoomkeys, NULL ); rb->set_option(items[7].desc, &key_weapon, INT, doomkeys, numdoomkeys, NULL );
key_weapon=translatekey(key_weapon); key_weapon=translatekey(key_weapon);
break; break;
case 8:
key_map=translatekey(key_map);
rb->set_option(items[8].desc, &key_map, INT, doomkeys, numdoomkeys, NULL );
key_map=translatekey(key_map);
break;
default: default:
menuquit=1; menuquit=1;
break; break;