From f398819ce38c49b8781f70fa335fa9adff580862 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 2 Jan 2020 06:47:03 -0500 Subject: [PATCH] - due to issues with chat, scoreboard, and the stat screen, disable 320x200 in multiplayer for now --- src/rendering/r_videoscale.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rendering/r_videoscale.cpp b/src/rendering/r_videoscale.cpp index 4fc9f6c124..d86221ede5 100644 --- a/src/rendering/r_videoscale.cpp +++ b/src/rendering/r_videoscale.cpp @@ -42,8 +42,7 @@ #define NUMSCALEMODES countof(vScaleTable) -extern bool setsizeneeded; -extern bool generic_ui; +extern bool setsizeneeded, multiplayer, generic_ui; EXTERN_CVAR(Int, vid_aspect) @@ -109,7 +108,7 @@ namespace static bool lastspecialUI = false; bool isInActualMenu = false; - bool specialUI = (generic_ui || !!log_vgafont || !!dlg_vgafont || ConsoleState != c_up || + bool specialUI = (generic_ui || !!log_vgafont || !!dlg_vgafont || ConsoleState != c_up || multiplayer || (menuactive == MENU_On && CurrentMenu && !CurrentMenu->IsKindOf("ConversationMenu"))); if (specialUI == lastspecialUI)