nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-07 07:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

pgup/dn should work in menus, primarily for the packages menu.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6015 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-08-09 23:06:28 +00:00
parent b76d139a58
commit a13a436594
1 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
engine/client/m_items.c
View file

@ -99,7 +99,7 @@ extern cvar_t cl_cursorsize;
extern cvar_t cl_cursorbias; extern cvar_t cl_cursorbias;
extern cvar_t m_preset_chosen; extern cvar_t m_preset_chosen;
extern menu_t *topmenu; extern menu_t *topmenu;
menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old); menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old, qboolean wrap);
#ifdef HEXEN2 #ifdef HEXEN2
//this function is so fucked up. //this function is so fucked up.
@ -1028,7 +1028,7 @@ menuoption_t *MC_AddCursorSmall(emenu_t *menu, menuresel_t *reselection, int x,
if (menu->reselection) if (menu->reselection)
{ {
menuoption_t *sel, *firstsel = M_NextSelectableItem(menu, NULL); menuoption_t *sel, *firstsel = M_NextSelectableItem(menu, NULL, false);
for (sel = firstsel; sel; ) for (sel = firstsel; sel; )
{ {
if (sel->common.posx == menu->reselection->x && sel->common.posy == menu->reselection->y) if (sel->common.posx == menu->reselection->x && sel->common.posy == menu->reselection->y)
@ -1037,7 +1037,7 @@ menuoption_t *MC_AddCursorSmall(emenu_t *menu, menuresel_t *reselection, int x,
n->common.posy = sel->common.posy; n->common.posy = sel->common.posy;
break; break;
} }
sel = M_NextSelectableItem(menu, sel); sel = M_NextSelectableItem(menu, sel, false);
if (sel == firstsel) if (sel == firstsel)
break; break;
} }
@ -1100,7 +1100,7 @@ menupicture_t *MC_AddCursor(emenu_t *menu, menuresel_t *reselection, int x, int
if (menu->reselection) if (menu->reselection)
{ {
menuoption_t *sel, *firstsel = M_NextSelectableItem(menu, NULL); menuoption_t *sel, *firstsel = M_NextSelectableItem(menu, NULL, false);
for (sel = firstsel; sel; ) for (sel = firstsel; sel; )
{ {
if (sel->common.posx == menu->reselection->x && sel->common.posy == menu->reselection->y) if (sel->common.posx == menu->reselection->x && sel->common.posy == menu->reselection->y)
@ -1109,7 +1109,7 @@ menupicture_t *MC_AddCursor(emenu_t *menu, menuresel_t *reselection, int x, int
n->common.posy = sel->common.posy; n->common.posy = sel->common.posy;
break; break;
} }
sel = M_NextSelectableItem(menu, sel); sel = M_NextSelectableItem(menu, sel, false);
if (sel == firstsel) if (sel == firstsel)
break; break;
} }
@ -1894,7 +1894,7 @@ static menuoption_t *M_NextItem(emenu_t *m, menuoption_t *old)
} }
return op; return op;
} }
menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old) menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old, qboolean wrap)
{ {
menuoption_t *op; menuoption_t *op;
@ -1911,6 +1911,8 @@ menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old)
if (!op) if (!op)
op = m->options; op = m->options;
if (op == m->options && !wrap)
return NULL;
op = M_NextItem(m, op); op = M_NextItem(m, op);
if (!op) if (!op)
op = m->options; op = m->options;
@ -1928,7 +1930,7 @@ menuoption_t *M_NextSelectableItem(emenu_t *m, menuoption_t *old)
} }
} }
menuoption_t *M_PrevSelectableItem(emenu_t *m, menuoption_t *old) menuoption_t *M_PrevSelectableItem(emenu_t *m, menuoption_t *old, qboolean wrap)
{ {
menuoption_t *op; menuoption_t *op;
@ -1947,7 +1949,11 @@ menuoption_t *M_PrevSelectableItem(emenu_t *m, menuoption_t *old)
op = op->common.next; op = op->common.next;
if (!op) if (!op)
{
if (!wrap)
return NULL;
op = m->options; op = m->options;
}
if (op == old) if (op == old)
return old; //whoops. return old; //whoops.
@ -2031,27 +2037,38 @@ void M_Complex_Key(emenu_t *currentmenu, int key, int unicode)
case K_KP_DOWNARROW: case K_KP_DOWNARROW:
case K_GP_DPAD_DOWN: case K_GP_DPAD_DOWN:
godown: godown:
currentmenu->selecteditem = M_NextSelectableItem(currentmenu, currentmenu->selecteditem); currentmenu->selecteditem = M_NextSelectableItem(currentmenu, currentmenu->selecteditem, true);
goto gone;
if (currentmenu->selecteditem)
{
#ifdef HEXEN2
if (M_GameType() == MGT_HEXEN2)
S_LocalSound ("raven/menu1.wav");
else
#endif
S_LocalSound ("misc/menu1.wav");
if (currentmenu->cursoritem)
currentmenu->cursoritem->common.posy = currentmenu->selecteditem->common.posy;
}
break;
case K_UPARROW: case K_UPARROW:
case K_KP_UPARROW: case K_KP_UPARROW:
case K_GP_DPAD_UP: case K_GP_DPAD_UP:
goup: goup:
currentmenu->selecteditem = M_PrevSelectableItem(currentmenu, currentmenu->selecteditem); currentmenu->selecteditem = M_PrevSelectableItem(currentmenu, currentmenu->selecteditem, true);
goto gone;
case K_PGDN:
for (key = 0; key < 10; key++)
{
menuoption_t *op = M_NextSelectableItem(currentmenu, currentmenu->selecteditem, false);
if (op)
currentmenu->selecteditem = op;
else
break;
}
goto gone;
case K_PGUP:
for (key = 0; key < 10; key++)
{
menuoption_t *op = M_PrevSelectableItem(currentmenu, currentmenu->selecteditem, false);
if (op)
currentmenu->selecteditem = op;
else
break;
}
goto gone;
gone:
if (currentmenu->selecteditem) if (currentmenu->selecteditem)
{ {
#ifdef HEXEN2 #ifdef HEXEN2