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

Merge #2826 #2829 #2835

Browse source 
2826: map_convert_07: Check for width/height 0 r=Learath2 a=def-

as suggested by Jupeyy

2829: Add libsteam_api.a to gitignore r=Learath2 a=def-



2835: Make spacing in top menu buttons consistent, fit for 5:4 r=Learath2 a=def-

![screenshot-20200915@184840](https://user-images.githubusercontent.com/2335377/93240346-4db9fe00-f784-11ea-9755-3a52f51d2755.png)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-09-15 17:08:45 +00:00 committed by GitHub
parent 3b0bb7d777 f9ec8c5696 ef1e6d45be 7a82779ff7
commit c1d54da9f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -40,6 +40,7 @@ testrunner\[1\]_include.cmake
DDNet DDNet
DDNet-Server DDNet-Server
DDNet-Server-Launcher DDNet-Server-Launcher
libsteam_api.a
config_retrieve config_retrieve
config_store config_store
crapnet crapnet

6
src/game/client/components/menus.cpp
View file

@ -741,7 +741,7 @@ int CMenus::RenderMenubar(CUIRect r)
TextRender()->SetRenderFlags(0); TextRender()->SetRenderFlags(0);
TextRender()->SetCurFont(NULL); TextRender()->SetCurFont(NULL);
Box.VSplitLeft(5.0f, 0, &Box); Box.VSplitLeft(10.0f, 0, &Box);
// offline menus // offline menus
if(m_ActivePage == PAGE_NEWS) if(m_ActivePage == PAGE_NEWS)
@ -797,7 +797,7 @@ int CMenus::RenderMenubar(CUIRect r)
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
} }
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(90.0f, &Button, &Box);
static int s_DDNetButton = 0; static int s_DDNetButton = 0;
if(DoButton_MenuTab(&s_DDNetButton, "DDNet", m_ActivePage == PAGE_DDNET, &Button, 0)) if(DoButton_MenuTab(&s_DDNetButton, "DDNet", m_ActivePage == PAGE_DDNET, &Button, 0))
{ {
@ -810,7 +810,7 @@ int CMenus::RenderMenubar(CUIRect r)
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
} }
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(90.0f, &Button, &Box);
static int s_KoGButton = 0; static int s_KoGButton = 0;
if(DoButton_MenuTab(&s_KoGButton, "KoG", m_ActivePage == PAGE_KOG, &Button, CUI::CORNER_TR)) if(DoButton_MenuTab(&s_KoGButton, "KoG", m_ActivePage == PAGE_KOG, &Button, CUI::CORNER_TR))
{ {

2
src/tools/map_convert_07.cpp
View file

@ -98,7 +98,7 @@ bool CheckImageDimensions(void *pItem, int Type, const char *pFilename)
CMapItemImage *pImgItem = (CMapItemImage *)pItem2; CMapItemImage *pImgItem = (CMapItemImage *)pItem2;
if(pImgItem->m_Width % 16 == 0 && pImgItem->m_Height % 16 == 0) if(pImgItem->m_Width % 16 == 0 && pImgItem->m_Height % 16 == 0 && pImgItem->m_Width > 0 && pImgItem->m_Height > 0)
return true; return true;
char aTileLayerName[12]; char aTileLayerName[12];