From e00e6c2722f2078c9dcb4acec70f9d83dc094a5e Mon Sep 17 00:00:00 2001 From: Sebastien Benard Date: Wed, 16 Oct 2024 18:00:20 +0200 Subject: [PATCH] FIX more consistant enum naming --- src/ldtk/macro/TypeBuilder.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ldtk/macro/TypeBuilder.hx b/src/ldtk/macro/TypeBuilder.hx index 7dca727..1e21140 100644 --- a/src/ldtk/macro/TypeBuilder.hx +++ b/src/ldtk/macro/TypeBuilder.hx @@ -609,7 +609,7 @@ class TypeBuilder { // Create IntGrid abstract enum from values var intType = macro : Int; var enumTypeDef : TypeDefinition = { - name: l.identifier+"_IntGridValues", + name: modName+"_IntGridEnum_"+l.identifier, pack: modPack, doc: "IntGrid values from layer "+l.identifier+" available as an Abstract Enum of Int", kind: TDAbstract(intType, [AbEnum, AbTo(intType)], [intType], [intType]), @@ -618,8 +618,8 @@ class TypeBuilder { } for(v in l.intGridValues) { var groupInf = l.intGridValuesGroups.filter( g->g.uid==v.groupUid )[0]; - var groupId = groupInf!=null ? "_"+groupInf.identifier+"_" : "_"; - var enumUid = l.identifier + groupId + ( v.identifier!=null ? v.identifier : Std.string(v.value) ); + var groupId = groupInf!=null ? groupInf.identifier+"_" : ""; + var enumUid = l.identifier + "_" + groupId + ( v.identifier!=null ? v.identifier : Std.string(v.value) ); enumTypeDef.fields.push({ name: sanitizeIdentifier(enumUid), pos: curPos,