checkpoint - mostly working condition after changes

1 files changed, 2 insertions, 1 deletions

diff --git a/src/ecs.cpp b/src/ecs.cpp
index f499835..c627642 100644
--- a/src/ecs.cpp
+++ b/src/ecs.cpp
@@ -51,6 +51,7 @@ void ECS_GetEntity_Inner(EntityHandle entHandle, Entity_Base*& ent) {
 }
 
 void ECS_Init() {
+	Buckets_Init(Entities_GenericsBC, maxBucketItemCount);
 	Buckets_Init(Entities_BucketContainer, maxBucketItemCount);
 	Buckets_Init(Comp_GrBinds_BucketContainer, maxBucketItemCount);
 	Buckets_Init(Comp_Instance_BucketContainer, maxBucketItemCount);
@@ -66,7 +67,7 @@ EntityHandle ECS_CreateEntity(Entity_Base *entity, Entity_Base *parentEntity) {
 	assert(entity->handle == EntityHandle_MAX && "Entity already created!");
 	EntityHandle entityHandle{Buckets_NewHandle(Entities_BucketContainer)};
 	entity->handle = entityHandle;
-	entity->parentHandle = parentEntity->handle;
+	if (parentEntity) entity->parentHandle = parentEntity->handle;
 	Entities_BucketContainer.buckets[entityHandle.bucketIndex][entityHandle.itemIndex] = entity;
 	return entityHandle;
 }