Skip to content

Commit

Permalink
!XB (CryEntitySystem) Fix faulty assertion thrown for legacy IGameObj…
Browse files Browse the repository at this point in the history
…ectExtension creation

Copied from Perforce
 Change: 1536248
  • Loading branch information
Cry-59 committed Jul 19, 2017
1 parent ad4dcbf commit 2062906
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Code/CryEngine/CryCommon/CryEntitySystem/IEntity.h
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,6 @@ struct IEntity
{
static const CryGUID& GetGUID()
{
CRY_ASSERT_MESSAGE(cryiidof<ComponentType>() != cryiidof<IEntityComponent>(), "Component must implement an IID function returning CryGUID!");
return cryiidof<ComponentType>();
}

Expand Down Expand Up @@ -892,7 +891,7 @@ struct IEntity
}
else
{
//return static_cast<ComponentType*>(GetComponentByTypeId(SComponentType<ComponentType>::GetGUID()));
return static_cast<ComponentType*>(GetComponentByTypeId(SComponentType<ComponentType>::GetGUID()));
}

return nullptr;
Expand Down

0 comments on commit 2062906

Please sign in to comment.