q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-21 11:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed the serverinfo menu

Browse source 
was q3a style
now it is also q3rally style
This commit is contained in:
q3rally 2021-02-23 04:36:36 +00:00
parent 284cf003e3
commit a69dfd5687
3 changed files with 17 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
engine/code/q3_ui/ui_serverinfo.c
View file

@ -23,17 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// //
#include "ui_local.h" #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[] = static char* serverinfo_artlist[] =
{ {
SERVERINFO_FRAMEL,
SERVERINFO_FRAMER,
SERVERINFO_BACK0,
SERVERINFO_BACK1,
NULL NULL
}; };
@ -44,9 +35,7 @@ typedef struct
{ {
menuframework_s menu; menuframework_s menu;
menutext_s banner; menutext_s banner;
menubitmap_s framel; menutext_s back;
menubitmap_s framer;
menubitmap_s back;
menutext_s add; menutext_s add;
char info[MAX_INFO_STRING]; char info[MAX_INFO_STRING];
int numlines; int numlines;
@ -141,10 +130,10 @@ static void ServerInfo_MenuDraw( void )
Q_strcat( key, MAX_INFO_KEY, ":" ); 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.25 - 8,y,key,UI_RIGHT|UI_SMALLFONT,text_color_normal);
UI_DrawString(SCREEN_WIDTH*0.50 + 8,y,value,UI_LEFT|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 ); Menu_Draw( &s_serverinfo.menu );
@ -206,28 +195,12 @@ void UI_ServerInfoMenu( void )
s_serverinfo.banner.color = color_white; s_serverinfo.banner.color = color_white;
s_serverinfo.banner.style = UI_CENTER; 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.type = MTYPE_PTEXT;
s_serverinfo.add.generic.flags = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS; s_serverinfo.add.generic.flags = QMF_CENTER_JUSTIFY|QMF_PULSEIFFOCUS;
s_serverinfo.add.generic.callback = ServerInfo_Event; s_serverinfo.add.generic.callback = ServerInfo_Event;
s_serverinfo.add.generic.id = ID_ADD; s_serverinfo.add.generic.id = ID_ADD;
s_serverinfo.add.generic.x = 320; s_serverinfo.add.generic.x = 350;
s_serverinfo.add.generic.y = 371; s_serverinfo.add.generic.y = 416;
s_serverinfo.add.string = "ADD TO FAVORITES"; s_serverinfo.add.string = "ADD TO FAVORITES";
s_serverinfo.add.style = UI_CENTER|UI_SMALLFONT; s_serverinfo.add.style = UI_CENTER|UI_SMALLFONT;
s_serverinfo.add.color = color_red; s_serverinfo.add.color = color_red;
@ -235,16 +208,15 @@ void UI_ServerInfoMenu( void )
s_serverinfo.add.generic.flags |= QMF_GRAYED; s_serverinfo.add.generic.flags |= QMF_GRAYED;
} }
s_serverinfo.back.generic.type = MTYPE_BITMAP; s_serverinfo.back.generic.type = MTYPE_PTEXT;
s_serverinfo.back.generic.name = SERVERINFO_BACK0;
s_serverinfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; s_serverinfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_serverinfo.back.generic.callback = ServerInfo_Event; s_serverinfo.back.generic.callback = ServerInfo_Event;
s_serverinfo.back.generic.id = ID_BACK; s_serverinfo.back.generic.id = ID_BACK;
s_serverinfo.back.generic.x = 0; s_serverinfo.back.generic.x = 0;
s_serverinfo.back.generic.y = 480-64; s_serverinfo.back.generic.y = 416;
s_serverinfo.back.width = 128; s_serverinfo.back.string = "<BACK";
s_serverinfo.back.height = 64; s_serverinfo.back.style = UI_LEFT|UI_SMALLFONT;
s_serverinfo.back.focuspic = SERVERINFO_BACK1; s_serverinfo.back.color = color_red;
trap_GetConfigString( CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING ); trap_GetConfigString( CS_SERVERINFO, s_serverinfo.info, MAX_INFO_STRING );
@ -262,8 +234,6 @@ void UI_ServerInfoMenu( void )
s_serverinfo.numlines = 16; s_serverinfo.numlines = 16;
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.banner ); Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.banner );
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framel );
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.framer );
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.add ); Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.add );
Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.back ); Menu_AddItem( &s_serverinfo.menu, (void*) &s_serverinfo.back );

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.3.0_r295" #define PRODUCT_VERSION "v0.0.3.0_r297"
#endif #endif

6
q3rallycode.ppr
View file

@ -875,9 +875,10 @@ q3rallycode
14=engine\code\q3_ui\ui_rally_options.c 14=engine\code\q3_ui\ui_rally_options.c
15=engine\code\q3_ui\ui_rally_servers.c 15=engine\code\q3_ui\ui_rally_servers.c
16=engine\code\qcommon\qcommon.h 16=engine\code\qcommon\qcommon.h
17=engine\code\q3_ui\ui_serverinfo.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\qcommon\qcommon.h Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\files.c] [engine\code\qcommon\files.c]
TopLine=3681 TopLine=3681
Caret=1,3695 Caret=1,3695
@ -929,3 +930,6 @@ Caret=1,1244
[engine\code\qcommon\qcommon.h] [engine\code\qcommon\qcommon.h]
TopLine=253 TopLine=253
Caret=51,267 Caret=51,267
[engine\code\q3_ui\ui_serverinfo.c]
TopLine=111
Caret=29,136