Skip to content

Commit

Permalink
[Editor]
Browse files Browse the repository at this point in the history
* Entity def equal checks now factor in the category.
  • Loading branch information
luciusDXL committed Jan 20, 2024
1 parent 669172c commit 38cd4e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions TheForceEngine/TFE_Editor/LevelEditor/entity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1122,13 +1122,13 @@ namespace LevelEditor
bool entityDefsEqual(const Entity* e0, const Entity* e1)
{
return (e0->name == e1->name && e0->assetName == e1->assetName && e0->type == e1->type &&
logicListsMatch(e0->logic, e1->logic) && varListsMatch(e0->var, e1->var));
logicListsMatch(e0->logic, e1->logic) && varListsMatch(e0->var, e1->var) && e0->categories == e1->categories);
}

bool entityDefsEqualIgnoreName(const Entity* e0, const Entity* e1)
{
return (e0->assetName == e1->assetName && e0->type == e1->type &&
logicListsMatch(e0->logic, e1->logic) && varListsMatch(e0->var, e1->var));
logicListsMatch(e0->logic, e1->logic) && varListsMatch(e0->var, e1->var) && e0->categories == e1->categories);
}

s32 getEntityDefId(const Entity* srcEntity)
Expand Down

0 comments on commit 38cd4e5

Please sign in to comment.