mirror of
https://github.com/SWG-Source/src.git
synced 2026-09-26 13:13:14 -04:00
Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags
Now builds/runs using c++11
This commit is contained in:
@@ -543,8 +543,8 @@ void AiDebugString::addCircleAtObjectOffset(NetworkId const & target, Vector con
|
||||
// Object-space circle relative to the target
|
||||
|
||||
if (radius > 0.0f)
|
||||
{
|
||||
m_circleList->push_back(std::make_pair(target, std::make_pair(Circle(position_o, radius), color)));
|
||||
{
|
||||
m_circleList->push_back(std::make_pair(CachedNetworkId(target), std::make_pair(Circle(position_o, radius), color)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -100,7 +100,7 @@ void AppearanceManager::install()
|
||||
crcStringVector = new CrcStringVector();
|
||||
crcStringVector->reserve(static_cast<size_t>(numberOfColumns));
|
||||
|
||||
ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair(new PersistentCrcString(crcSourceName), crcStringVector));
|
||||
ms_objectTemplateAppearanceTemplateMap.insert(std::make_pair((const CrcString*)new PersistentCrcString(crcSourceName), crcStringVector));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user