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

Merge #1851

Browse source 
1851: Fix blockZ and infectionZ r=def- a=fokkonaut

I talked to coffee (creator of both mods) and he said it is okay to use zoom on the mods, also: eye emotes work there so the eye wheel is also supported. I have updated both mods to ddnet master so they have all the new stuff

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-07-24 06:16:05 +00:00
parent 102ddc4d49 5c280a3c9d
commit 898e6ca958
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/shared/serverbrowser.cpp
View file

@ -49,7 +49,7 @@ bool IsDDRace(const CServerInfo *pInfo)
bool IsBlockInfectionZ(const CServerInfo *pInfo) bool IsBlockInfectionZ(const CServerInfo *pInfo)
{ {
return str_find_nocase(pInfo->m_aGameType, "blockZ") return str_find_nocase(pInfo->m_aGameType, "blockZ")
|| str_find_nocase(pInfo->m_aGameType, "infection"); || str_find_nocase(pInfo->m_aGameType, "infectionZ");
} }
bool IsBlockWorlds(const CServerInfo *pInfo) bool IsBlockWorlds(const CServerInfo *pInfo)
@ -60,9 +60,9 @@ bool IsBlockWorlds(const CServerInfo *pInfo)
bool IsDDNet(const CServerInfo *pInfo) bool IsDDNet(const CServerInfo *pInfo)
{ {
return (str_find_nocase(pInfo->m_aGameType, "ddracenet") return str_find_nocase(pInfo->m_aGameType, "ddracenet")
|| str_find_nocase(pInfo->m_aGameType, "ddnet")) || str_find_nocase(pInfo->m_aGameType, "ddnet")
&& !IsBlockInfectionZ(pInfo); || IsBlockInfectionZ(pInfo);
} }
// other // other