diff --git a/engine/code/q3_ui/ui_serverinfo.c b/engine/code/q3_ui/ui_serverinfo.c index bc70ce8f..8cda7220 100644 --- a/engine/code/q3_ui/ui_serverinfo.c +++ b/engine/code/q3_ui/ui_serverinfo.c @@ -23,17 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // #include "ui_local.h" -#define SERVERINFO_FRAMEL "menu/art/frame2_l" -#define SERVERINFO_FRAMER "menu/art/frame1_r" -#define SERVERINFO_BACK0 "menu/art/back_0" -#define SERVERINFO_BACK1 "menu/art/back_1" - static char* serverinfo_artlist[] = { - SERVERINFO_FRAMEL, - SERVERINFO_FRAMER, - SERVERINFO_BACK0, - SERVERINFO_BACK1, NULL }; @@ -44,9 +35,7 @@ typedef struct { menuframework_s menu; menutext_s banner; - menubitmap_s framel; - menubitmap_s framer; - menubitmap_s back; + menutext_s back; menutext_s add; char info[MAX_INFO_STRING]; int numlines; @@ -141,10 +130,10 @@ static void ServerInfo_MenuDraw( void ) Q_strcat( key, MAX_INFO_KEY, ":" ); - UI_DrawString(SCREEN_WIDTH*0.50 - 8,y,key,UI_RIGHT|UI_SMALLFONT,color_red); - UI_DrawString(SCREEN_WIDTH*0.50 + 8,y,value,UI_LEFT|UI_SMALLFONT,text_color_normal); + UI_DrawString(SCREEN_WIDTH*0.25 - 8,y,key,UI_RIGHT|UI_SMALLFONT,text_color_normal); + UI_DrawString(SCREEN_WIDTH*0.25 + 8,y,value,UI_LEFT|UI_SMALLFONT,text_color_normal); - y += SMALLCHAR_HEIGHT; + y += SMALLCHAR_HEIGHT/1.18; } Menu_Draw( &s_serverinfo.menu ); @@ -206,28 +195,12 @@ void UI_ServerInfoMenu( void ) s_serverinfo.banner.color = color_white; s_serverinfo.banner.style = UI_CENTER; - s_serverinfo.framel.generic.type = MTYPE_BITMAP; - s_serverinfo.framel.generic.name = SERVERINFO_FRAMEL; - s_serverinfo.framel.generic.flags = QMF_INACTIVE; - s_serverinfo.framel.generic.x = 0; - s_serverinfo.framel.generic.y = 78; - s_serverinfo.framel.width = 256; - s_serverinfo.framel.height = 329; - - s_serverinfo.framer.generic.type = MTYPE_BITMAP; - s_serverinfo.framer.generic.name = SERVERINFO_FRAMER; - s_serverinfo.framer.generic.flags = QMF_INACTIVE; - s_serverinfo.framer.generic.x = 376; - s_serverinfo.framer.generic.y = 76; - s_serverinfo.framer.width = 256; - s_serverinfo.framer.height = 334; - s_serverinfo.add.generic.type = MTYPE_PTEXT; s_serverinfo.add.generic.flags = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS; s_serverinfo.add.generic.callback = ServerInfo_Event; s_serverinfo.add.generic.id = ID_ADD; - s_serverinfo.add.generic.x = 320; - s_serverinfo.add.generic.y = 371; + s_serverinfo.add.generic.x = 350; + s_serverinfo.add.generic.y = 416; s_serverinfo.add.string = "ADD TO FAVORITES"; s_serverinfo.add.style = UI_CENTER|UI_SMALLFONT; s_serverinfo.add.color = color_red; @@ -235,16 +208,15 @@ void UI_ServerInfoMenu( void ) s_serverinfo.add.generic.flags |= QMF_GRAYED; } - s_serverinfo.back.generic.type = MTYPE_BITMAP; - s_serverinfo.back.generic.name = SERVERINFO_BACK0; + s_serverinfo.back.generic.type = MTYPE_PTEXT; s_serverinfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; s_serverinfo.back.generic.callback = ServerInfo_Event; s_serverinfo.back.generic.id = ID_BACK; s_serverinfo.back.generic.x = 0; - s_serverinfo.back.generic.y = 480-64; - s_serverinfo.back.width = 128; - s_serverinfo.back.height = 64; - s_serverinfo.back.focuspic = SERVERINFO_BACK1; + s_serverinfo.back.generic.y = 416; + s_serverinfo.back.string = "