mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tokenisation to ignore multiple spaces

Browse Source 
This was SVN commit r7676.
This commit is contained in:
Ykkrosh
2010-07-03 15:21:50 +00:00
parent e23d4d232a
commit df86f4d27b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/system/ParamNode.cpp
+9 -4
View File
@@ -86,13 +86,18 @@ void CParamNode::ApplyLayer(const XMBFile& xmb, const XMBElement& element)
{
CParamNode& node = m_Childs[name];
std::wstring newValue(value.begin(), value.end());
// Split into tokens
std::vector<std::wstring> oldTokens;
std::vector<std::wstring> newTokens;
if (!node.m_Value.empty())
boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space());
if (!newValue.empty())
boost::algorithm::split(newTokens, newValue, boost::algorithm::is_space());
boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space());
boost::algorithm::split(newTokens, newValue, boost::algorithm::is_space());
// Delete empty tokens
oldTokens.erase(std::remove_if(oldTokens.begin(), oldTokens.end(), std::mem_fun_ref(&std::wstring::empty)), oldTokens.end());
newTokens.erase(std::remove_if(newTokens.begin(), newTokens.end(), std::mem_fun_ref(&std::wstring::empty)), newTokens.end());
// Merge the two lists
std::vector<std::wstring> tokens = oldTokens;
for (size_t i = 0; i < newTokens.size(); ++i)
{