summaryrefslogtreecommitdiff
path: root/source/ui_menu.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2008-04-23 15:02:41 +0000
committerAndrey Nazarov <skuller@skuller.net>2008-04-23 15:02:41 +0000
commit49e6170b49fbb933eddec6d0e3f946320c68832f (patch)
tree88d228d6f89103710074fdba041ce80584d5caa6 /source/ui_menu.c
parent8c795585fb0c6c9178d9981f6943da04b7279205 (diff)
Added `dumpents' server command.
Added support for `cl_noskins' value of 2 (default all female skins to `female/athena', all male skins to `male/grunt'). Renamed `scoreshot' command to `aashot', added `aadump' command. Fixed several alignment issues on ARM architecture. Server browser menu now indicates full and password protected servers with color codes. Implemented history search in console with Ctrl+R, Ctrl+S. Removed `cl_railtrail_alpha' variable, all `cl_rail*_color' variables now accept colors in #RRGGBBAA format. Added `map_override' cvar (enables loading map entity lump from external maps/*.ent file). Made `quit' command accept extra arguments. Made `draw' command accept arbitrary colors in #RRGGBBAA format. Fixed debian packages.
Diffstat (limited to 'source/ui_menu.c')
-rw-r--r--source/ui_menu.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/source/ui_menu.c b/source/ui_menu.c
index 44795a8..510f037 100644
--- a/source/ui_menu.c
+++ b/source/ui_menu.c
@@ -575,20 +575,21 @@ MenuList_Key
=================
*/
static int MenuList_Key( menuList_t *l, int key ) {
- int i;
+ //int i;
if( !l->items ) {
return QMS_NOTHANDLED;
}
- if( keys.IsDown( K_CTRL ) && key >= '1' && key <= '9' ) {
- int col = key - '0' - 1;
+ if( keys.IsDown( K_ALT ) && Q_isdigit( key ) ) {
+ int col = key == '0' ? 9 : key - '0' - 1;
if( l->sortdir && col < l->numcolumns ) {
return MenuList_SetColumn( l, col );
}
return QMS_NOTHANDLED;
}
+#if 0
if( key > 32 && key < 127 ) {
if( uis.realtime > l->scratchTime + 1300 ) {
l->scratchCount = 0;
@@ -620,11 +621,13 @@ static int MenuList_Key( menuList_t *l, int key ) {
return QMS_NOTHANDLED;
}
+#endif
l->scratchCount = 0;
switch( key ) {
case K_LEFTARROW:
+ case 'h':
if( l->sortdir ) {
if( l->sortcol > 0 ) {
return MenuList_SetColumn( l, l->sortcol - 1 );
@@ -633,6 +636,7 @@ static int MenuList_Key( menuList_t *l, int key ) {
}
break;
case K_RIGHTARROW:
+ case 'l':
if( l->sortdir ) {
if( l->sortcol < l->numcolumns - 1 ) {
return MenuList_SetColumn( l, l->sortcol + 1 );
@@ -642,6 +646,7 @@ static int MenuList_Key( menuList_t *l, int key ) {
break;
case K_UPARROW:
case K_KP_UPARROW:
+ case 'k':
if( l->curvalue > 0 ) {
l->curvalue--;
UI_CALLBACK( l, QM_CHANGE, l->curvalue );
@@ -652,6 +657,7 @@ static int MenuList_Key( menuList_t *l, int key ) {
case K_DOWNARROW:
case K_KP_DOWNARROW:
+ case 'j':
if( l->curvalue < l->numItems - 1 ) {
l->curvalue++;
UI_CALLBACK( l, QM_CHANGE, l->curvalue );