From 31b8bda9bd636d8807adc468e9b00e64f3346561 Mon Sep 17 00:00:00 2001 From: svdijk Date: Tue, 25 Sep 2012 23:30:55 +0000 Subject: [PATCH] Finetuning of previous commit git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@732 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/gl_draw.c | 20 ++++++++++---------- Quake/menu.c | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Quake/gl_draw.c b/Quake/gl_draw.c index 447f1b61..c9d0c3a7 100644 --- a/Quake/gl_draw.c +++ b/Quake/gl_draw.c @@ -104,11 +104,11 @@ byte pic_up_data[8][8] = { {255,255,255,255,255,255,255,255}, {255,255,255,255,255,255,255,255}, - {255,255, 5, 4, 2,255,255,255}, - {255, 3, 6, 4, 2, 1,255,255}, - {255, 6, 5, 4, 3, 2,255,255}, - { 3, 6, 4, 4, 4, 2, 1,255}, - { 6, 5, 4, 4, 4, 3, 2,255}, + {255,255,255, 7,255,255,255,255}, + {255,255, 8, 8, 6,255,255,255}, + {255, 8, 8, 2, 6, 6,255,255}, + { 8, 8, 2, 2,255, 8, 9,255}, + {255, 2, 2,255,255,255, 2, 2}, {255,255,255,255,255,255,255,255}, }; @@ -116,12 +116,12 @@ byte pic_down_data[8][8] = { {255,255,255,255,255,255,255,255}, {255,255,255,255,255,255,255,255}, - { 6, 5, 4, 4, 4, 3, 2,255}, - { 3, 6, 4, 4, 4, 2, 1,255}, - {255, 6, 5, 4, 3, 2,255,255}, - {255, 3, 6, 4, 2, 1,255,255}, - {255,255, 5, 4, 2,255,255,255}, {255,255,255,255,255,255,255,255}, + { 8, 8,255,255,255, 8, 9,255}, + {255, 8, 8,255, 6, 6, 2, 2}, + {255,255, 8, 8, 6, 2, 2,255}, + {255,255,255, 7, 2, 2,255,255}, + {255,255,255,255, 2,255,255,255}, }; //QuakeSpasm diff --git a/Quake/menu.c b/Quake/menu.c index 00c8668e..537cfa1e 100644 --- a/Quake/menu.c +++ b/Quake/menu.c @@ -1282,7 +1282,7 @@ const char *bindnames[][2] = #define NUMCOMMANDS (sizeof(bindnames)/sizeof(bindnames[0])) -#define KEYS_SIZE 15 +#define KEYS_SIZE 18 static int keys_cursor; qboolean m_keys_bind_grab; @@ -1359,9 +1359,9 @@ void M_Keys_Draw (void) M_Print (18, 32, "Enter to change, backspace to clear"); if (keys_top) - Draw_Pic (6, 48, pic_up); + M_DrawTransPic (6, 48, pic_up); if (keys_top + KEYS_SIZE < (int)NUMCOMMANDS) - Draw_Pic (6, 48 + ((KEYS_SIZE-1)*8), pic_down); + M_DrawTransPic (6, 48 + ((KEYS_SIZE-1)*8), pic_down); // search for known bindings for (i = 0; i < KEYS_SIZE; i++)