q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-22 03:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some issues with in the Q3Rally menu

Browse source 
Fix DLL crash when opening demos menu (arrow items are PTEXT with NULL string).
Add/fix scroll arrows in demos menu.
Fix "Only humans" option in server browser always being disabled and not aligned with other options.
Make specify server menu use back/next text in the same place as parent server browser menu.
This commit is contained in:
zturtleman 2017-11-17 04:51:26 +00:00
parent 4a9094482d
commit c38c1a2f14
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/code/q3_ui/ui_demo2.c
View file

@ -131,7 +131,8 @@ static void Demos_MenuInit( void ) {
s_demos.banner.color = color_white;
s_demos.banner.style = UI_CENTER;
s_demos.left.generic.type = MTYPE_PTEXT;
s_demos.left.generic.type = MTYPE_BITMAP;
s_demos.left.generic.name = ART_LEFT0;
s_demos.left.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_demos.left.generic.x = 260;
s_demos.left.generic.y = 480-70;
@ -139,8 +140,10 @@ static void Demos_MenuInit( void ) {
s_demos.left.generic.callback = Demos_MenuEvent;
s_demos.left.width = 20;
s_demos.left.height = 20;
s_demos.left.focuspic = ART_LEFT1;
s_demos.right.generic.type = MTYPE_PTEXT;
s_demos.right.generic.type = MTYPE_BITMAP;
s_demos.right.generic.name = ART_RIGHT0;
s_demos.right.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_demos.right.generic.x = 400;
s_demos.right.generic.y = 480-70;
@ -148,6 +151,7 @@ static void Demos_MenuInit( void ) {
s_demos.right.generic.callback = Demos_MenuEvent;
s_demos.right.width = 20;
s_demos.right.height = 20;
s_demos.right.focuspic = ART_RIGHT1;
s_demos.back.generic.type = MTYPE_PTEXT;
s_demos.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
@ -163,11 +167,11 @@ static void Demos_MenuInit( void ) {
s_demos.go.generic.flags = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;
s_demos.go.generic.id = ID_GO;
s_demos.go.generic.callback = Demos_MenuEvent;
s_demos.go.generic.x = 580;
s_demos.go.generic.x = 640 - 20;
s_demos.go.generic.y = 480-64;
s_demos.go.string = "GO >";
s_demos.go.color = text_color_normal;
s_demos.go.style = UI_LEFT | UI_SMALLFONT;
s_demos.go.style = UI_RIGHT | UI_SMALLFONT;
s_demos.list.generic.type = MTYPE_SCROLLLIST;
s_demos.list.generic.flags = QMF_PULSEIFFOCUS;

4
engine/code/q3_ui/ui_rally_servers.c
View file

@ -657,7 +657,7 @@ static void ArenaServers_UpdateMenu( void ) {
g_arenaservers.gametype.generic.flags &= ~QMF_GRAYED;
g_arenaservers.sortkey.generic.flags &= ~QMF_GRAYED;
g_arenaservers.showempty.generic.flags &= ~QMF_GRAYED;
g_arenaservers.onlyhumans.generic.flags &= QMF_GRAYED;
g_arenaservers.onlyhumans.generic.flags &= ~QMF_GRAYED;
g_arenaservers.showfull.generic.flags &= ~QMF_GRAYED;
// STONELANCE
// g_arenaservers.list.generic.flags |= QMF_GRAYED;
@ -1648,7 +1648,7 @@ static void ArenaServers_MenuInit( void ) {
g_arenaservers.onlyhumans.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
g_arenaservers.onlyhumans.generic.callback = ArenaServers_Event;
g_arenaservers.onlyhumans.generic.id = ID_ONLY_HUMANS;
g_arenaservers.onlyhumans.generic.x = 320;
g_arenaservers.onlyhumans.generic.x = 330;
g_arenaservers.onlyhumans.generic.y = y;
// STONELANCE

12
engine/code/q3_ui/ui_specifyserver.c
View file

@ -136,18 +136,18 @@ void SpecifyServer_MenuInit( void )
s_specifyserver.go.generic.flags = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS;
s_specifyserver.go.generic.callback = SpecifyServer_Event;
s_specifyserver.go.generic.id = ID_SPECIFYSERVERGO;
s_specifyserver.go.generic.x = 640;
s_specifyserver.go.generic.y = 480-64;
s_specifyserver.go.string = "FIGHT >";
s_specifyserver.go.generic.x = 640 - 20;
s_specifyserver.go.generic.y = 480 - 50;
s_specifyserver.go.string = "CONNECT >";
s_specifyserver.go.color = text_color_normal;
s_specifyserver.go.style = UI_LEFT | UI_SMALLFONT;
s_specifyserver.go.style = UI_RIGHT | UI_SMALLFONT;
s_specifyserver.back.generic.type = MTYPE_PTEXT;
s_specifyserver.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_specifyserver.back.generic.callback = SpecifyServer_Event;
s_specifyserver.back.generic.id = ID_SPECIFYSERVERBACK;
s_specifyserver.back.generic.x = 0;
s_specifyserver.back.generic.y = 480 - 64;
s_specifyserver.back.generic.x = 20;
s_specifyserver.back.generic.y = 480 - 50;
s_specifyserver.back.string = "< BACK";
s_specifyserver.back.color = text_color_normal;
s_specifyserver.back.style = UI_LEFT | UI_SMALLFONT;