diff --git a/code/ui/ui_controls.c b/code/ui/ui_controls.c index ce39cb21d..a46dda5aa 100644 --- a/code/ui/ui_controls.c +++ b/code/ui/ui_controls.c @@ -1632,7 +1632,7 @@ static void Controls_MenuInit(void) { Menu_AddItem(&s_controls.menu, &s_controls.chat4); Menu_AddItem(&s_controls.menu, &s_controls.pushToTalk); Menu_AddItem(&s_controls.menu, &s_controls.gesture); - Menu_AddItem(&s_controls.menu, &s_controls.teamorders); +// Menu_AddItem(&s_controls.menu, &s_controls.teamorders); Menu_AddItem(&s_controls.menu, &s_controls.showscores); Menu_AddItem(&s_controls.menu, &s_controls.togglemenu); diff --git a/code/ui/ui_ingame.c b/code/ui/ui_ingame.c index 2597ad111..b44ad0f89 100644 --- a/code/ui/ui_ingame.c +++ b/code/ui/ui_ingame.c @@ -258,7 +258,7 @@ static void InGame_MenuInit(void) { s_ingame.removebots.generic.flags |= QMF_GRAYED; } - y += INGAME_MENU_VERTICAL_SPACING; +/* y += INGAME_MENU_VERTICAL_SPACING; s_ingame.teamorders.generic.type = MTYPE_TEXTS; s_ingame.teamorders.fontHeight = 20.0f; s_ingame.teamorders.generic.flags = QMF_CENTER_JUSTIFY; @@ -280,7 +280,7 @@ static void InGame_MenuInit(void) { s_ingame.teamorders.generic.flags |= QMF_GRAYED; } } - + */ y += INGAME_MENU_VERTICAL_SPACING; s_ingame.voiceingame.generic.type = MTYPE_TEXTS; s_ingame.voiceingame.fontHeight = 20.0f; @@ -436,7 +436,7 @@ static void InGame_MenuInit(void) { Menu_AddItem(&s_ingame.menu, &s_ingame.team); Menu_AddItem(&s_ingame.menu, &s_ingame.addbots); Menu_AddItem(&s_ingame.menu, &s_ingame.removebots); - Menu_AddItem(&s_ingame.menu, &s_ingame.teamorders); +// Menu_AddItem(&s_ingame.menu, &s_ingame.teamorders); Menu_AddItem(&s_ingame.menu, &s_ingame.voiceingame); Menu_AddItem(&s_ingame.menu, &s_ingame.callvote); Menu_AddItem(&s_ingame.menu, &s_ingame.setup); diff --git a/code/ui/ui_teamorders.c b/code/ui/ui_teamorders.c index 5868f6038..1117d15ef 100644 --- a/code/ui/ui_teamorders.c +++ b/code/ui/ui_teamorders.c @@ -382,6 +382,8 @@ UI_TeamOrdersMenu =============== */ void UI_TeamOrdersMenu(void) { + return; // disabled for now until issues with bo chat are fixed + trap_Cvar_Set("cl_paused", "1"); // pause game and indirectly pause/stop background music UI_TeamOrdersMenu_Init();