From ed69f5636280b2f1c5a87e5d34590441cde3e4f6 Mon Sep 17 00:00:00 2001 From: Dan Olson Date: Wed, 23 Apr 2008 03:22:21 -0700 Subject: [PATCH] osezer patch 004 fixed broken keybinding in the menu (it used to bind fly_center, not jump, for example.) --- base/m_misc.c | 3 +++ base/mn_menu.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/base/m_misc.c b/base/m_misc.c index 6b8cfa5..8173b08 100644 --- a/base/m_misc.c +++ b/base/m_misc.c @@ -453,6 +453,9 @@ extern int snd_Mport; // midi variables default_t defaults[] = { +/* change of order here affects mn_menu.c : + * see, for example, Options3Items there... + */ { "mouse_sensitivity", &mouseSensitivity, 5 }, { "sfx_volume", &snd_MaxVolume, 10}, { "music_volume", &snd_MusicVolume, 10}, diff --git a/base/mn_menu.c b/base/mn_menu.c index 2e9f7b4..c371b78 100644 --- a/base/mn_menu.c +++ b/base/mn_menu.c @@ -382,16 +382,20 @@ static Menu_t Options2Menu = static MenuItem_t Options3Items[] = { +/* see defaults[] in m_misc.c for the correct option number: + * key_right corresponds to defaults[3], which means that we + * are using the (index_number - 3) here. + */ { ITT_SETKEY, "TURN RIGHT :", SCSetKey, 0, MENU_NONE }, { ITT_SETKEY, "TURN LEFT :", SCSetKey, 1, MENU_NONE }, { ITT_SETKEY, "MOVE FORWARD :", SCSetKey, 2, MENU_NONE }, { ITT_SETKEY, "MOVE BACK :" , SCSetKey, 3, MENU_NONE }, { ITT_SETKEY, "STRAFE LEFT :", SCSetKey, 4, MENU_NONE }, { ITT_SETKEY, "STRAFE RIGHT :", SCSetKey, 5, MENU_NONE }, - { ITT_SETKEY, "FLY UP :", SCSetKey, 6, MENU_NONE }, - { ITT_SETKEY, "FLY DOWN :", SCSetKey, 7, MENU_NONE }, - { ITT_SETKEY, "FLY CENTER :", SCSetKey, 8, MENU_NONE }, - { ITT_SETKEY, "JUMP :", SCSetKey, 9, MENU_NONE }, + { ITT_SETKEY, "JUMP :", SCSetKey, 6, MENU_NONE }, + { ITT_SETKEY, "FLY UP :", SCSetKey, 7, MENU_NONE }, + { ITT_SETKEY, "FLY DOWN :", SCSetKey, 8, MENU_NONE }, + { ITT_SETKEY, "FLY CENTER :", SCSetKey, 9, MENU_NONE }, { ITT_SETKEY, "LOOK UP :", SCSetKey, 10, MENU_NONE }, { ITT_SETKEY, "LOOK DOWN :", SCSetKey, 11, MENU_NONE }, { ITT_SETKEY, "LOOK CENTER :", SCSetKey, 12, MENU_NONE }, -- 2.39.2