From caed223c053106efdc23ca9fa3ed382ce9ec7868 Mon Sep 17 00:00:00 2001 From: q3rally Date: Sun, 15 May 2016 06:57:10 +0000 Subject: [PATCH] fix wrong buttons in add bot menu ingame --- engine/code/q3_ui/ui_addbots.c | 25 ++++++++++++++++++++----- q3rallycode.ppr | 8 ++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/engine/code/q3_ui/ui_addbots.c b/engine/code/q3_ui/ui_addbots.c index 0db86962..6b310db6 100644 --- a/engine/code/q3_ui/ui_addbots.c +++ b/engine/code/q3_ui/ui_addbots.c @@ -360,15 +360,30 @@ static void UI_AddBotsMenu_Init( void ) { addBotsMenuInfo.team.generic.flags = QMF_GRAYED; } - addBotsMenuInfo.go.generic.type = MTYPE_PTEXT; + addBotsMenuInfo.go.generic.type = MTYPE_PTEXT; + addBotsMenuInfo.go.generic.flags = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS; + addBotsMenuInfo.go.generic.id = ID_GO; + addBotsMenuInfo.go.generic.callback = UI_AddBotsMenu_FightEvent; + addBotsMenuInfo.go.generic.x = 320+128; + addBotsMenuInfo.go.generic.y = 256+128-64; + addBotsMenuInfo.go.string = "GO"; + addBotsMenuInfo.go.color = text_color_normal; + addBotsMenuInfo.go.style = UI_RIGHT | UI_SMALLFONT; + +/* to remove + + addBotsMenuInfo.go.generic.type = MTYPE_BITMAP; + addBotsMenuInfo.go.generic.name = ART_FIGHT0; addBotsMenuInfo.go.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; addBotsMenuInfo.go.generic.id = ID_GO; addBotsMenuInfo.go.generic.callback = UI_AddBotsMenu_FightEvent; - addBotsMenuInfo.go.generic.x = 320+128; + addBotsMenuInfo.go.generic.x = 320+128-128; addBotsMenuInfo.go.generic.y = 256+128-64; - addBotsMenuInfo.go.string = "GO"; - addBotsMenuInfo.go.color = text_color_normal; - addBotsMenuInfo.go.style = UI_RIGHT | UI_SMALLFONT; + addBotsMenuInfo.go.width = 128; + addBotsMenuInfo.go.height = 64; + addBotsMenuInfo.go.focuspic = ART_FIGHT1; + +*/ addBotsMenuInfo.back.generic.type = MTYPE_PTEXT; addBotsMenuInfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; diff --git a/q3rallycode.ppr b/q3rallycode.ppr index ab667585..54997167 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -875,11 +875,11 @@ Selected=engine\code\q3_ui\ui_addbots.c TopLine=40 Caret=39,58 [engine\code\q3_ui\ui_addbots.c] -TopLine=356 -Caret=42,367 +TopLine=361 +Caret=21,373 [engine\code\q3_ui\ui_cdkey.c] -TopLine=259 -Caret=1,277 +TopLine=246 +Caret=1,262 [engine\code\q3_ui\ui_cinematics.c] TopLine=309 Caret=1,325