edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic fixes, include intrinsics file for mingw

Browse source
This commit is contained in:
LordSk 2018-10-24 21:33:30 +02:00
parent 8353185c5a
commit 1126fa8926
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/client/client.cpp
View file

@ -2,6 +2,7 @@
/* If you are missing that file, acquire a complete release at teeworlds.com. */ /* If you are missing that file, acquire a complete release at teeworlds.com. */
#include <new> #include <new>
#include <immintrin.h> //_mm_pause
#include <stdlib.h> // qsort #include <stdlib.h> // qsort
#include <stdarg.h> #include <stdarg.h>

5
src/game/client/components/menus_settings.cpp
View file

@ -1252,7 +1252,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
BottomView.HSplitTop(20.f, 0, &BottomView); BottomView.HSplitTop(20.f, 0, &BottomView);
// render screen menu background // render screen menu background
int NumOptions = 4; int NumOptions = 3 + (!g_Config.m_GfxFullscreen);
if(Graphics()->GetNumScreens() > 1) if(Graphics()->GetNumScreens() > 1)
++NumOptions; ++NumOptions;
float ButtonHeight = 20.0f; float ButtonHeight = 20.0f;
@ -1275,7 +1275,10 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
ScreenLeft.HSplitTop(ButtonHeight, &Label, &ScreenLeft); ScreenLeft.HSplitTop(ButtonHeight, &Label, &ScreenLeft);
Label.y += 2.0f; Label.y += 2.0f;
UI()->DoLabel(&Label, Localize("Screen"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER); UI()->DoLabel(&Label, Localize("Screen"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
ScreenLeft.VSplitMid(&ScreenLeft, &ScreenRight); 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(Spacing, 0, &ScreenLeft);
ScreenLeft.HSplitTop(ButtonHeight, &Button, &ScreenLeft); ScreenLeft.HSplitTop(ButtonHeight, &Button, &ScreenLeft);