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

Merge #1432

Browse source 
1432: Merge BW support into IsDDNet r=def- a=fokkonaut

from now on Blockworlds can use this server message to tell the client not to use the DDRace (time) scoreboard.
(https://github.com/ddnet/ddnet/pull/1387)

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-01-14 17:16:06 +00:00
parent f3e3701ae2 ade7b13f98
commit 19aef99d0c
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/serverbrowser.h
View file

@ -70,7 +70,6 @@ bool IsRace(const CServerInfo *pInfo);
bool IsFastCap(const CServerInfo *pInfo); bool IsFastCap(const CServerInfo *pInfo);
bool IsDDRace(const CServerInfo *pInfo); bool IsDDRace(const CServerInfo *pInfo);
bool IsDDNet(const CServerInfo *pInfo); bool IsDDNet(const CServerInfo *pInfo);
bool IsBlockWorlds(const CServerInfo *pInfo);
bool Is64Player(const CServerInfo *pInfo); bool Is64Player(const CServerInfo *pInfo);
bool IsPlus(const CServerInfo *pInfo); bool IsPlus(const CServerInfo *pInfo);

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

@ -55,16 +55,12 @@ bool IsBlockInfectionZ(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")
|| (str_comp_nocase_num(pInfo->m_aGameType, "bw ", 4) == 0)
|| (str_comp_nocase(pInfo->m_aGameType, "bw") == 0))
&& !IsBlockInfectionZ(pInfo); && !IsBlockInfectionZ(pInfo);
} }
bool IsBlockWorlds(const CServerInfo *pInfo)
{
return str_comp_nocase_num(pInfo->m_aGameType, "bw ", 4) == 0
|| str_comp_nocase(pInfo->m_aGameType, "bw") == 0;
}
// other // other
bool Is64Player(const CServerInfo *pInfo) bool Is64Player(const CServerInfo *pInfo)

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

@ -27,7 +27,7 @@ void CCamera::OnRender()
CServerInfo Info; CServerInfo Info;
Client()->GetServerInfo(&Info); Client()->GetServerInfo(&Info);
if(!(m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || IsBlockWorlds(&Info) || Client()->State() == IClient::STATE_DEMOPLAYBACK)) if(!(m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || Client()->State() == IClient::STATE_DEMOPLAYBACK))
{ {
m_ZoomSet = false; m_ZoomSet = false;
m_Zoom = 1.0; m_Zoom = 1.0;
@ -108,7 +108,7 @@ void CCamera::ConZoomPlus(IConsole::IResult *pResult, void *pUserData)
CCamera *pSelf = (CCamera *)pUserData; CCamera *pSelf = (CCamera *)pUserData;
CServerInfo Info; CServerInfo Info;
pSelf->Client()->GetServerInfo(&Info); pSelf->Client()->GetServerInfo(&Info);
if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || IsBlockWorlds(&Info) || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK) if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
((CCamera *)pUserData)->m_Zoom *= ZoomStep; ((CCamera *)pUserData)->m_Zoom *= ZoomStep;
} }
void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData) void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData)
@ -116,7 +116,7 @@ void CCamera::ConZoomMinus(IConsole::IResult *pResult, void *pUserData)
CCamera *pSelf = (CCamera *)pUserData; CCamera *pSelf = (CCamera *)pUserData;
CServerInfo Info; CServerInfo Info;
pSelf->Client()->GetServerInfo(&Info); pSelf->Client()->GetServerInfo(&Info);
if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || IsBlockWorlds(&Info) || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK) if(pSelf->m_pClient->m_Snap.m_SpecInfo.m_Active || IsRace(&Info) || pSelf->Client()->State() == IClient::STATE_DEMOPLAYBACK)
{ {
if(((CCamera *)pUserData)->m_Zoom < 500.0f/ZoomStep) if(((CCamera *)pUserData)->m_Zoom < 500.0f/ZoomStep)
{ {

2
src/game/client/components/emoticon.cpp
View file

@ -141,7 +141,7 @@ void CEmoticon::OnRender()
CServerInfo pServerInfo; CServerInfo pServerInfo;
Client()->GetServerInfo(&pServerInfo); Client()->GetServerInfo(&pServerInfo);
if((IsDDRace(&pServerInfo) || IsDDNet(&pServerInfo) || IsBlockWorlds(&pServerInfo) || IsPlus(&pServerInfo)) && g_Config.m_ClEyeWheel) if((IsDDRace(&pServerInfo) || IsDDNet(&pServerInfo) || IsPlus(&pServerInfo)) && g_Config.m_ClEyeWheel)
{ {
Graphics()->TextureSet(-1); Graphics()->TextureSet(-1);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();