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

Merge #5431

Browse source 
5431: Fix wrongly corrected naming introduced in #5391 r=Robyt3 a=Chairn

Sorry 😭 

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Chairn <chairn.nq@hotmail.fr>
This commit is contained in:
bors[bot] 2022-06-15 19:35:46 +00:00 committed by GitHub
parent b8a82f71aa b80af9beb3
commit d6d3b2d392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -573,7 +573,7 @@ CServerBrowser::CServerEntry *CServerBrowser::Add(const NETADDR &Addr)
CNetworkCountry *pCntr = &Network.m_aCountries[i];
for(int j = 0; j < pCntr->m_NumServers; j++)
{
if(net_addr_comp(&Addr, &pCntr->m_vServers[j]) == 0)
if(net_addr_comp(&Addr, &pCntr->m_aServers[j]) == 0)
{
pEntry->m_Info.m_Official = true;
break;
@ -1016,7 +1016,7 @@ void CServerBrowser::UpdateFromHttp()
if(DDNetFiltered(pExcludeTypes, pCntr->m_aTypes[g]))
continue;
vWantedAddresses.push_back(CWantedAddr{pCntr->m_vServers[g], false, false});
vWantedAddresses.push_back(CWantedAddr{pCntr->m_aServers[g], false, false});
}
}
}
@ -1415,7 +1415,7 @@ void CServerBrowser::LoadDDNetServers()
continue;
}
const char *pStr = json_string_get(pAddr);
net_addr_from_str(&pCntr->m_vServers[pCntr->m_NumServers], pStr);
net_addr_from_str(&pCntr->m_aServers[pCntr->m_NumServers], pStr);
str_copy(pCntr->m_aTypes[pCntr->m_NumServers], pType, sizeof(pCntr->m_aTypes[pCntr->m_NumServers]));
}
}
@ -1434,7 +1434,7 @@ void CServerBrowser::RecheckOfficial()
CNetworkCountry *pCntr = &Network.m_aCountries[i];
for(int j = 0; j < pCntr->m_NumServers; j++)
{
CServerEntry *pEntry = Find(pCntr->m_vServers[j]);
CServerEntry *pEntry = Find(pCntr->m_aServers[j]);
if(pEntry)
{
pEntry->m_Info.m_Official = true;
@ -1538,7 +1538,7 @@ const char *CServerBrowser::GetTutorialServer()
CNetworkCountry *pCntr = &pNetwork->m_aCountries[i];
for(int j = 0; j < pCntr->m_NumServers; j++)
{
CServerEntry *pEntry = Find(pCntr->m_vServers[j]);
CServerEntry *pEntry = Find(pCntr->m_aServers[j]);
if(!pEntry)
continue;
if(str_find(pEntry->m_Info.m_aName, "(Tutorial)") == 0)

2
src/engine/client/serverbrowser.h
View file

@ -42,7 +42,7 @@ public:
char m_aName[256];
int m_FlagID;
NETADDR m_vServers[MAX_SERVERS];
NETADDR m_aServers[MAX_SERVERS];
char m_aTypes[MAX_SERVERS][32];
int m_NumServers;