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

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 @@
 #define ENDGAME     "are you sure you want to end the game?\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 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 {
 #define KEY_UPARROW        0xad
 #define KEY_DOWNARROW      0xaf
 #define KEY_ESCAPE         0x1B
-#define KEY_ENTER          0x0D
-#define KEY_TAB            0x09
+#define KEY_ENTER          0x60     // Changed due to button reconfig - 0x0D
+#define KEY_TAB            0x61     // Changed due to button reconfig - 0x09
 #define KEY_F1          (0x80+0x3b)
 #define KEY_F2          (0x80+0x3c)
 #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 @@
 // GNU General Public License for more details.
 //
 // $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
 //
 // Revision 1.2  2006-04-03 00:28:13  kkurbjun
@@ -928,7 +931,7 @@ void M_DrawEpisode(void)
 
 void M_VerifyNightmare(int ch)
 {
-   if (ch != KEY_ENTER)
+   if (ch != key_menu_enter)
       return;
 
    G_DeferedInitNew(nightmare,epi+1,1);
@@ -1030,7 +1033,7 @@ void M_ChangeMessages(int choice)
 //
 void M_EndGameResponse(int ch)
 {
-   if (ch != KEY_ENTER)
+   if (ch != key_menu_enter)
       return;
 
    // 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)
 {
-   if (ch != KEY_ENTER)
+   if (ch != key_menu_enter)
       return;
    if (!netgame)
    {
@@ -1391,7 +1394,7 @@ boolean M_Responder (event_t* ev)
 
       if (ev->data1&1)
       {
-         ch = KEY_ENTER;
+         ch = key_menu_enter;
          joywait = I_GetTime() + 5;
       }
       if (ev->data1&2)
@@ -1435,7 +1438,7 @@ boolean M_Responder (event_t* ev)
 
          if (ev->data1&1)
          {
-            ch = KEY_ENTER;
+            ch = key_menu_enter;
             mousewait = I_GetTime() + 15;
          }
 
@@ -1501,7 +1504,7 @@ boolean M_Responder (event_t* ev)
    if (messageToPrint)
    {
       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;
 
       menuactive = messageLastMenuActive;
@@ -1566,7 +1569,7 @@ boolean M_Responder (event_t* ev)
    // Pop-up menu?
    if (!menuactive)
    {
-      if (ch == KEY_ESCAPE)
+      if (ch == key_menu_escape)
       {
          M_StartControlPanel ();
          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[] =
        0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to move forward
       {"key_down",        {&key_down, NULL},           {KEY_DOWNARROW, NULL},
        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  //     |
-      {"key_menu_left",   {&key_menu_left, NULL},      {KEY_LEFTARROW} ,//     V
-       0,MAX_KEY,def_key,ss_keys, NULL}, // key to move left in a menu
+      {"key_menu_left",   {&key_menu_left, NULL},      {KEY_LEFTARROW, NULL} ,//     V
+       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}   ,
        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} ,
@@ -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
       {"key_menu_enter",  {&key_menu_enter, NULL},     {KEY_ENTER, NULL}     ,
        0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to select from menu
-*/
+
       {"key_strafeleft",  {&key_strafeleft, NULL},     {',', NULL},
        0,MAX_KEY,def_key,ss_keys, 0, 0}, // key to strafe left
       {"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
       {"key_backspace",   {&key_backspace, NULL},      {KEY_BACKSPACE, NULL},
        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
       {"key_map",         {&key_map, NULL},            {KEY_TAB, NULL},
        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)
             return 'w';
          case 9:
             return KEY_ENTER;
+         case 10:
          default:
             return 0;
       }
@@ -510,6 +511,7 @@ int translatekey(int key)
             return 8;
          case KEY_ENTER:
             return 9;
+         case KEY_F9:
          default:
             return 0;
       }
@@ -547,6 +549,7 @@ int Oset_keys()
       { "Game Open", NULL },
       { "Game Strafe", NULL },
       { "Game Weapon", NULL },
+      { "Game Automap", NULL },
    };
 
    m = rb->menu_init(items, sizeof(items) / sizeof(*items),
@@ -601,10 +604,16 @@ int Oset_keys()
 
          case 7:
             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);
             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:
             menuquit=1;
             break;