From 1126fa892698e8003653eb313e07647f7afe2c7c Mon Sep 17 00:00:00 2001 From: LordSk Date: Wed, 24 Oct 2018 21:33:30 +0200 Subject: [PATCH] Cosmetic fixes, include intrinsics file for mingw --- src/engine/client/client.cpp | 1 + src/game/client/components/menus_settings.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp index 5d778133b..f49e36dc4 100644 --- a/src/engine/client/client.cpp +++ b/src/engine/client/client.cpp @@ -2,6 +2,7 @@ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #include +#include //_mm_pause #include // qsort #include diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index b4997ae40..394b7b92c 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -1252,7 +1252,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView) BottomView.HSplitTop(20.f, 0, &BottomView); // render screen menu background - int NumOptions = 4; + int NumOptions = 3 + (!g_Config.m_GfxFullscreen); if(Graphics()->GetNumScreens() > 1) ++NumOptions; float ButtonHeight = 20.0f; @@ -1275,7 +1275,10 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView) ScreenLeft.HSplitTop(ButtonHeight, &Label, &ScreenLeft); Label.y += 2.0f; UI()->DoLabel(&Label, Localize("Screen"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER); + ScreenLeft.VSplitMid(&ScreenLeft, &ScreenRight); + ScreenLeft.VSplitRight(Spacing * 0.5f, &ScreenLeft, 0); + ScreenRight.VSplitLeft(Spacing * 0.5f, 0, &ScreenRight); ScreenLeft.HSplitTop(Spacing, 0, &ScreenLeft); ScreenLeft.HSplitTop(ButtonHeight, &Button, &ScreenLeft);