swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-05 06:16:47 -04:00
Code Issues Projects Releases Wiki Activity

Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags

Browse Source 
Now builds/runs using c++11
This commit is contained in:
Anonymous
2014-01-23 08:55:46 -07:00
parent fabe85739d
commit e6431a9fd4
14 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/ai/Squad.cpp
+2 -2
View File
@@ -180,7 +180,7 @@ void Squad::addUnit(NetworkId const & unit)
//-- Add the unit to the new squad
IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, &PersistentCrcString::empty)));
IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), &PersistentCrcString::empty)));
if (leader)
{
@@ -419,7 +419,7 @@ void Squad::buildFormation()
NetworkId const & unit = iterSortedUnitList->second.first;
PersistentCrcString const * unitName = iterSortedUnitList->second.second;
IGNORE_RETURN(m_unitMap->insert(std::make_pair(unit, unitName)));
IGNORE_RETURN(m_unitMap->insert(std::make_pair(CachedNetworkId(unit), unitName)));
}
m_formation.build(*this);