birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes for Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-13 16:05:20 -07:00
parent 1d4c53a777
commit 5f7b534afd
66 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Objects/EntityObject.cpp
+13 -13
View File
@@ -63,7 +63,7 @@ protected:
void Undo([[maybe_unused]] bool bUndo) override
{
for (int i = 0, iLinkSize(m_Links.size()); i < iLinkSize; ++i)
for (int i = 0, iLinkSize = static_cast<int>(m_Links.size()); i < iLinkSize; ++i)
{
SLink& link = m_Links[i];
CBaseObject* pObj = GetIEditor()->GetObjectManager()->FindObject(link.entityID);
@@ -1217,7 +1217,7 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN
if (!m_links.empty())
{
XmlNodeRef linksNode = objNode->newChild("EntityLinks");
for (int i = 0, num = m_links.size(); i < num; i++)
for (size_t i = 0, num = m_links.size(); i < num; i++)
{
if (m_links[i].target)
{
@@ -1368,8 +1368,8 @@ void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx
// Clone event targets.
if (!pFromEntity->m_eventTargets.empty())
{
int numTargets = pFromEntity->m_eventTargets.size();
for (int i = 0; i < numTargets; i++)
size_t numTargets = pFromEntity->m_eventTargets.size();
for (size_t i = 0; i < numTargets; i++)
{
CEntityEventTarget& et = pFromEntity->m_eventTargets[i];
CBaseObject* pClonedTarget = ctx.FindClone(et.target);
@@ -1386,7 +1386,7 @@ void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx
// Clone links.
if (!pFromEntity->m_links.empty())
{
int numTargets = pFromEntity->m_links.size();
int numTargets = static_cast<int>(pFromEntity->m_links.size());
for (int i = 0; i < numTargets; i++)
{
CEntityLink& et = pFromEntity->m_links[i];
@@ -1437,7 +1437,7 @@ void CEntityObject::RemoveAllEntityLinks()
{
while (!m_links.empty())
{
RemoveEntityLink(m_links.size() - 1);
RemoveEntityLink(static_cast<int>(m_links.size() - 1));
}
m_links.clear();
SetModified(false);
@@ -1448,7 +1448,7 @@ void CEntityObject::ReleaseEventTargets()
{
while (!m_eventTargets.empty())
{
RemoveEventTarget(m_eventTargets.size() - 1, false);
RemoveEventTarget(static_cast<int>(m_eventTargets.size() - 1), false);
}
m_eventTargets.clear();
SetModified(false);
@@ -1518,7 +1518,7 @@ void CEntityObject::SaveLink(XmlNodeRef xmlNode)
}
XmlNodeRef linksNode = xmlNode->newChild("EntityLinks");
for (int i = 0, num = m_links.size(); i < num; i++)
for (size_t i = 0, num = m_links.size(); i < num; i++)
{
XmlNodeRef linkNode = linksNode->newChild("Link");
linkNode->setAttr("TargetId", m_links[i].targetId);
@@ -1534,7 +1534,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
if (event == CBaseObject::ON_DELETE)
{
// Find this target in events list and remove.
int numTargets = m_eventTargets.size();
int numTargets = static_cast<int>(m_eventTargets.size());
for (int i = 0; i < numTargets; i++)
{
if (m_eventTargets[i].target == target)
@@ -1547,7 +1547,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
}
else if (event == CBaseObject::ON_PREDELETE)
{
int numTargets = m_links.size();
int numTargets = static_cast<int>(m_links.size());
for (int i = 0; i < numTargets; i++)
{
if (m_links[i].target == target)
@@ -1589,7 +1589,7 @@ int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, con
m_eventTargets.push_back(et);
SetModified(false);
return m_eventTargets.size() - 1;
return static_cast<int>(m_eventTargets.size() - 1);
}
//////////////////////////////////////////////////////////////////////////
@@ -1659,13 +1659,13 @@ int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId)
SetModified(false);
return m_links.size() - 1;
return static_cast<int>(m_links.size() - 1);
}
//////////////////////////////////////////////////////////////////////////
bool CEntityObject::EntityLinkExists(const QString& name, GUID targetEntityId)
{
for (int i = 0, num = m_links.size(); i < num; ++i)
for (size_t i = 0, num = m_links.size(); i < num; ++i)
{
if (m_links[i].targetId == targetEntityId && name.compare(m_links[i].name, Qt::CaseInsensitive) == 0)
{