OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: I forgot to reimplement the number keys for Strife's dialogues when I redid the

Browse source 
menus to work with controllers.

SVN r2103 (trunk)
This commit is contained in:
Randy Heit 2010-01-08 02:10:05 +00:00
commit 1e5b84ea14
2 changed files with 51 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/m_menu.cpp
View file

@ -2966,40 +2966,47 @@ bool M_Responder (event_t *ev)
{
mkey = MKEY_Clear;
}
else if (!keyup && !OptionsActive)
else if (!keyup)
{
ch = tolower (ch);
if (messageToPrint)
if (OptionsActive)
{
// Take care of any messages that need input
ch = tolower (ch);
assert(messageRoutine != NULL);
if (ch != ' ' && ch != 'n' && ch != 'y')
{
return false;
}
D_RemoveNextCharEvent();
M_EndMessage(ch);
return true;
M_OptResponder(ev);
}
else
{
// Search for a menu item associated with the pressed key.
for (i = (itemOn + 1) % currentMenu->numitems;
i != itemOn;
i = (i + 1) % currentMenu->numitems)
ch = tolower (ch);
if (messageToPrint)
{
// Take care of any messages that need input
ch = tolower (ch);
assert(messageRoutine != NULL);
if (ch != ' ' && ch != 'n' && ch != 'y')
{
return false;
}
D_RemoveNextCharEvent();
M_EndMessage(ch);
return true;
}
else
{
// Search for a menu item associated with the pressed key.
for (i = (itemOn + 1) % currentMenu->numitems;
i != itemOn;
i = (i + 1) % currentMenu->numitems)
{
if (currentMenu->menuitems[i].alphaKey == ch)
{
break;
}
}
if (currentMenu->menuitems[i].alphaKey == ch)
{
break;
itemOn = i;
S_Sound(CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
return true;
}
}
if (currentMenu->menuitems[i].alphaKey == ch)
{
itemOn = i;
S_Sound(CHAN_VOICE | CHAN_UI, "menu/cursor", 1, ATTN_NONE);
return true;
}
}
}
break;