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

Merge pull request #8809 from furo321/append-settings

Browse source 
Transfer server settings while using append
This commit is contained in:
Dennis Felsing 2024-08-25 21:13:50 +00:00 committed by GitHub
parent 2fc3f81725 7628783e95
commit 7ee1dac08b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/editor/editor.cpp
View file

@ -8910,6 +8910,22 @@ bool CEditor::Append(const char *pFileName, int StorageType, bool IgnoreHistory)
} }
NewMap.m_vpGroups.clear(); NewMap.m_vpGroups.clear();
// transfer server settings
for(const auto &pSetting : NewMap.m_vSettings)
{
// Check if setting already exists
bool AlreadyExists = false;
for(const auto &pExistingSetting : m_Map.m_vSettings)
{
if(!str_comp(pExistingSetting.m_aCommand, pSetting.m_aCommand))
AlreadyExists = true;
}
if(!AlreadyExists)
m_Map.m_vSettings.push_back(pSetting);
}
NewMap.m_vSettings.clear();
auto IndexMap = SortImages(); auto IndexMap = SortImages();
if(!IgnoreHistory) if(!IgnoreHistory)